eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

qt5 fixes

Browse source
This commit is contained in:
Volker Fischer 2013-01-08 19:26:05 +00:00
parent f3c3acddca
commit 547dbf8e9a
7 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/chatdlg.h
View file

@ -30,12 +30,12 @@
#include <QLayout> #include <QLayout>
#include <QAccessible> #include <QAccessible>
#include "global.h" #include "global.h"
#ifdef _WIN32
# include "../windows/moc/chatdlgbase.h"
#else
#ifdef _IS_QMAKE_CONFIG #ifdef _IS_QMAKE_CONFIG
# include "ui_chatdlgbase.h" # include "ui_chatdlgbase.h"
#else #else
# ifdef _WIN32
# include "../windows/moc/chatdlgbase.h" // required if llcon.sln and MocQT.bat are used
# else
# include "moc/chatdlgbase.h" # include "moc/chatdlgbase.h"
# endif # endif
#endif #endif

6
src/clientsettingsdlg.h
View file

@ -37,12 +37,12 @@
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#include "multicolorled.h" #include "multicolorled.h"
#ifdef _WIN32
# include "../windows/moc/clientsettingsdlgbase.h"
#else
#ifdef _IS_QMAKE_CONFIG #ifdef _IS_QMAKE_CONFIG
# include "ui_clientsettingsdlgbase.h" # include "ui_clientsettingsdlgbase.h"
#else #else
# ifdef _WIN32
# include "../windows/moc/clientsettingsdlgbase.h" // required if llcon.sln and MocQT.bat are used
# else
# include "moc/clientsettingsdlgbase.h" # include "moc/clientsettingsdlgbase.h"
# endif # endif
#endif #endif

6
src/connectdlg.h
View file

@ -31,12 +31,12 @@
#include <QLocale> #include <QLocale>
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#ifdef _WIN32
# include "../windows/moc/connectdlgbase.h"
#else
#ifdef _IS_QMAKE_CONFIG #ifdef _IS_QMAKE_CONFIG
# include "ui_connectdlgbase.h" # include "ui_connectdlgbase.h"
#else #else
# ifdef _WIN32
# include "../windows/moc/connectdlgbase.h" // required if llcon.sln and MocQT.bat are used
# else
# include "moc/connectdlgbase.h" # include "moc/connectdlgbase.h"
# endif # endif
#endif #endif

6
src/llconclientdlg.h
View file

@ -41,12 +41,12 @@
#include "clientsettingsdlg.h" #include "clientsettingsdlg.h"
#include "chatdlg.h" #include "chatdlg.h"
#include "connectdlg.h" #include "connectdlg.h"
#ifdef _WIN32
# include "../windows/moc/llconclientdlgbase.h"
#else
#ifdef _IS_QMAKE_CONFIG #ifdef _IS_QMAKE_CONFIG
# include "ui_llconclientdlgbase.h" # include "ui_llconclientdlgbase.h"
#else #else
# ifdef _WIN32
# include "../windows/moc/llconclientdlgbase.h" // required if llcon.sln and MocQT.bat are used
# else
# include "moc/llconclientdlgbase.h" # include "moc/llconclientdlgbase.h"
# endif # endif
#endif #endif

6
src/llconserverdlg.h
View file

@ -37,12 +37,12 @@
#include "server.h" #include "server.h"
#include "settings.h" #include "settings.h"
#include "multicolorled.h" #include "multicolorled.h"
#ifdef _WIN32
# include "../windows/moc/llconserverdlgbase.h"
#else
#ifdef _IS_QMAKE_CONFIG #ifdef _IS_QMAKE_CONFIG
# include "ui_llconserverdlgbase.h" # include "ui_llconserverdlgbase.h"
#else #else
# ifdef _WIN32
# include "../windows/moc/llconserverdlgbase.h" // required if llcon.sln and MocQT.bat are used
# else
# include "moc/llconserverdlgbase.h" # include "moc/llconserverdlgbase.h"
# endif # endif
#endif #endif

7
src/util.h
View file

@ -40,13 +40,16 @@
#include "global.h" #include "global.h"
using namespace std; // because of the library: "vector" using namespace std; // because of the library: "vector"
#ifdef _WIN32 #ifdef _WIN32
# include "../windows/moc/aboutdlgbase.h" # define NOMINMAX // solves a compiler error in qdatetime.h (Qt5)
# include <windows.h> # include <windows.h>
# include <mmsystem.h> # include <mmsystem.h>
#else #endif
#ifdef _IS_QMAKE_CONFIG #ifdef _IS_QMAKE_CONFIG
# include "ui_aboutdlgbase.h" # include "ui_aboutdlgbase.h"
#else #else
# ifdef _WIN32
# include "../windows/moc/aboutdlgbase.h" // required if llcon.sln and MocQT.bat are used
# else
# include "moc/aboutdlgbase.h" # include "moc/aboutdlgbase.h"
# endif # endif
#endif #endif

1
windows/sound.h
View file

@ -25,6 +25,7 @@
#if !defined ( _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ ) #if !defined ( _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ )
#define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ #define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_
#define NOMINMAX // solves a compiler error in qdatetime.h (Qt5)
#include <windows.h> #include <windows.h>
#include <QMutex> #include <QMutex>
#include <QMessageBox> #include <QMessageBox>