Blob Blame Raw
diff -urNr client-2.3.0-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h client-2.3.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h
--- client-2.3.0-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-09-27 10:53:37.000000000 +0200
+++ client-2.3.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2016-10-11 07:58:58.953393364 +0200
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include <qtlockedfile.h>
+#include <QTSolutions/qtlockedfile.h>
 
 #include <QLocalServer>
 #include <QLocalSocket>
diff -urNr client-2.3.0-orig/src/gui/application.cpp client-2.3.0/src/gui/application.cpp
--- client-2.3.0-orig/src/gui/application.cpp	2016-09-27 10:53:37.000000000 +0200
+++ client-2.3.0/src/gui/application.cpp	2016-10-11 08:00:25.875964871 +0200
@@ -92,7 +92,7 @@
 // ----------------------------------------------------------------------------------
 
 Application::Application(int &argc, char **argv) :
-    SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
+    QtSingleApplication(Theme::instance()->appName() ,argc, argv),
     _gui(0),
     _theme(Theme::instance()),
     _helpOnly(false),
diff -urNr client-2.3.0-orig/src/gui/application.h client-2.3.0/src/gui/application.h
--- client-2.3.0-orig/src/gui/application.h	2016-09-27 10:53:37.000000000 +0200
+++ client-2.3.0/src/gui/application.h	2016-10-11 08:01:58.240768785 +0200
@@ -22,7 +22,7 @@
 #include <QElapsedTimer>
 #include <QNetworkConfigurationManager>
 
-#include "qtsingleapplication.h"
+#include "QtSolutions/QtSingleApplication"
 
 #include "syncresult.h"
 #include "logbrowser.h"
@@ -49,7 +49,7 @@
  * @brief The Application class
  * @ingroup gui
  */
-class Application : public SharedTools::QtSingleApplication
+class Application : public QtSingleApplication
 {
     Q_OBJECT
 public:
diff -urNr client-2.3.0-orig/src/gui/CMakeLists.txt client-2.3.0/src/gui/CMakeLists.txt
--- client-2.3.0-orig/src/gui/CMakeLists.txt	2016-09-27 10:53:37.000000000 +0200
+++ client-2.3.0/src/gui/CMakeLists.txt	2016-10-11 08:05:03.906753374 +0200
@@ -147,10 +147,6 @@
 
 set(3rdparty_SRC
     ../3rdparty/QProgressIndicator/QProgressIndicator.cpp
-    ../3rdparty/qtlockedfile/qtlockedfile.cpp
-    ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
-    ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
-    ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
    )
 
 if (APPLE)
@@ -161,18 +157,10 @@
         )
 endif()
 
-if(NOT WIN32)
-   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
-else()
-   list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
-endif()
-
 set(3rdparty_INC
     ${CMAKE_SOURCE_DIR}/src/3rdparty/qjson
     ${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
-    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
     ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src
-    ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
     )
 
 include_directories(${3rdparty_INC})
@@ -298,6 +286,8 @@
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_LockedFile-2.4 )
+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_SingleApplication-2.6 )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
 
 if(WITH_CRASHREPORTER)