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