Minor fixes to qtsingleapplication

3rdparty/qtsingleapplication/qtlocalpeer.cpp

@@ -125,7 +125,7 @@ bool QtLocalPeer::isClient()
         return true;
 
     bool res = server->listen(socketName);
-#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0))
+#ifdef Q_OS_UNIX
     // ### Workaround
     if (!res && server->serverError() == QAbstractSocket::AddressInUseError) {
         QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName);
@@ -153,7 +153,7 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout)
         if (connOk || i)
             break;
         int ms = 250;
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
         Sleep(DWORD(ms));
 #else
         struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };

src/CMakeLists.txt

@@ -72,7 +72,7 @@ link_directories(${TAGLIB_LIBRARY_DIRS})
 include_directories(${TAGLIB_INCLUDE_DIRS})
 
 include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
-include_directories(${QXT_INCLUDE_DIRS})
+include_directories(${QTSINGLECOREAPPLICATION_INCLUDE_DIRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
 include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
@@ -1055,7 +1055,7 @@ add_executable(strawberry
   MACOSX_BUNDLE
   ${STRAWBERRY-WIN32-FLAG}
   ${STRAWBERRY-WIN32-RESOURCES}
-  core/main.cpp
+  main.cpp
 )
 
 if(FREEBSD)

src/main.cpp

@@ -68,21 +68,21 @@
 
 #include "core/logging.h"
 
-#include "qtsingleapplication.h"
-#include "qtsinglecoreapplication.h"
+#include <qtsingleapplication.h>
+#include <qtsinglecoreapplication.h>
 
 #ifdef HAVE_DBUS
-#  include "mpris.h"
+#  include "core/mpris.h"
 #endif
-#include "utilities.h"
-#include "metatypes.h"
-#include "iconloader.h"
-#include "mainwindow.h"
-#include "commandlineoptions.h"
-#include "systemtrayicon.h"
-#include "application.h"
-#include "networkproxyfactory.h"
-#include "scangiomodulepath.h"
+#include "core/utilities.h"
+#include "core/metatypes.h"
+#include "core/iconloader.h"
+#include "core/mainwindow.h"
+#include "core/commandlineoptions.h"
+#include "core/systemtrayicon.h"
+#include "core/application.h"
+#include "core/networkproxyfactory.h"
+#include "core/scangiomodulepath.h"
 
 #include "widgets/osd.h"