Remove builtin qtwin and use WinExtras, replace some macros

3rdparty/qtsingleapplication/CMakeLists.txt

@@ -27,3 +27,5 @@ ADD_LIBRARY(qtsingleapplication STATIC
 )
 
 target_link_libraries(qtsingleapplication Qt5::Core Qt5::Widgets Qt5::Network)
+
+include_directories(${CMAKE_BINARY_DIR}/src)

3rdparty/qtsingleapplication/qtlockedfile.h

@@ -45,7 +45,7 @@
 #include <QVector>
 #endif
 
-#if defined(Q_WS_WIN) || defined(Q_OS_WIN)
+#if defined(Q_OS_WIN)
 #  if !defined(QT_QTLOCKEDFILE_EXPORT) && !defined(QT_QTLOCKEDFILE_IMPORT)
 #    define QT_QTLOCKEDFILE_EXPORT
 #  elif defined(QT_QTLOCKEDFILE_IMPORT)

3rdparty/qtsingleapplication/qtsingleapplication.cpp

@@ -37,6 +37,7 @@
 **
 ****************************************************************************/
 
+#include "config.h"
 
 #include "qtsingleapplication.h"
 
@@ -44,6 +45,10 @@
 #include <QWidget>
 #include <QString>
 
+#ifdef HAVE_X11_ // FIXME
+#  include <X11/Xlib.h>
+#endif
+
 #include "qtlocalpeer.h"
 
 /*!
@@ -173,14 +178,14 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char *
 }
 
 
-#if defined(Q_WS_X11)
+#if defined(HAVE_X11_) // FIXME
 /*!
   Special constructor for X11, ref. the documentation of
   QApplication's corresponding constructor. The application identifier
   will be QCoreApplication::applicationFilePath(). \a dpy, \a visual,
   and \a cmap are passed on to the QApplication constructor.
 */
-QtSingleApplication::QtSingleApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE cmap)
+QtSingleApplication::QtSingleApplication(Display *dpy, Qt::HANDLE visual, Qt::HANDLE cmap)
     : QApplication(dpy, visual, cmap)
 {
     sysInit();
@@ -206,7 +211,7 @@ QtSingleApplication::QtSingleApplication(Display *dpy, int &argc, char **argv, Q
   argv, \a visual, and \a cmap are passed on to the QApplication
   constructor.
 */
-QtSingleApplication::QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual, Qt::HANDLE cmap)
+QtSingleApplication::QtSingleApplication(Display *dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual, Qt::HANDLE cmap)
     : QApplication(dpy, argc, argv, visual, cmap)
 {
     sysInit(appId);

3rdparty/qtsingleapplication/qtsingleapplication.h

@@ -40,14 +40,21 @@
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
+#include "config.h"
+
 #include <QtGlobal>
 #include <QObject>
 #include <QWidget>
 #include <QApplication>
 #include <QString>
+
+#if defined(HAVE_X11_) // FIXME
+#  include <X11/Xlib.h>
+#endif
+
 class QtLocalPeer;
 
-#if defined(Q_WS_WIN) || defined(Q_OS_WIN32)
+#if defined(Q_OS_WIN) || defined(Q_OS_WIN32)
 #  if !defined(QT_QTSINGLEAPPLICATION_EXPORT) && !defined(QT_QTSINGLEAPPLICATION_IMPORT)
 #    define QT_QTSINGLEAPPLICATION_EXPORT
 #  elif defined(QT_QTSINGLEAPPLICATION_IMPORT)
@@ -70,10 +77,10 @@ class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication
 public:
     QtSingleApplication(int &argc, char **argv, bool GUIenabled = true);
     QtSingleApplication(const QString &id, int &argc, char **argv);
-#if defined(Q_WS_X11)
-    QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
+#if defined(HAVE_X11_) // FIXME
+    QtSingleApplication(Display *dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
     QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0);
-    QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
+    QtSingleApplication(Display *dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0);
 #endif
 
     bool isRunning();

3rdparty/qtsingleapplication/qtsinglecoreapplication.h

@@ -40,6 +40,8 @@
 #ifndef QTSINGLECOREAPPLICATION_H
 #define QTSINGLECOREAPPLICATION_H
 
+#include "config.h"
+
 #include <QCoreApplication>
 #include <QObject>
 #include <QString>