qt5 fixes

src/chatdlg.h

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

src/clientsettingsdlg.h

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

src/connectdlg.h

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

src/llconclientdlg.h

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

src/llconserverdlg.h

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

src/util.h

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

windows/sound.h

@@ -25,6 +25,7 @@
 #if !defined ( _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 <QMutex>
 #include <QMessageBox>