diff -urNr owncloudclient-2.4.0-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h owncloudclient-2.4.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h --- owncloudclient-2.4.0-orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2017-12-20 18:42:11.000000000 +0100 +++ owncloudclient-2.4.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2018-02-13 22:23:26.772426256 +0100 @@ -27,7 +27,7 @@ ** ****************************************************************************/ -#include +#include #include #include diff -urNr owncloudclient-2.4.0-orig/src/gui/application.cpp owncloudclient-2.4.0/src/gui/application.cpp --- owncloudclient-2.4.0-orig/src/gui/application.cpp 2017-12-20 18:42:11.000000000 +0100 +++ owncloudclient-2.4.0/src/gui/application.cpp 2018-02-13 22:25:51.846015381 +0100 @@ -95,7 +95,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 owncloudclient-2.4.0-orig/src/gui/application.h owncloudclient-2.4.0/src/gui/application.h --- owncloudclient-2.4.0-orig/src/gui/application.h 2017-12-20 18:42:11.000000000 +0100 +++ owncloudclient-2.4.0/src/gui/application.h 2018-02-13 22:27:18.007583524 +0100 @@ -22,7 +22,7 @@ #include #include -#include "qtsingleapplication.h" +#include "QtSolutions/QtSingleApplication" #include "syncresult.h" #include "logbrowser.h" @@ -52,7 +52,7 @@ * @brief The Application class * @ingroup gui */ -class Application : public SharedTools::QtSingleApplication +class Application : public QtSingleApplication { Q_OBJECT public: diff -urNr owncloudclient-2.4.0-orig/src/gui/CMakeLists.txt owncloudclient-2.4.0/src/gui/CMakeLists.txt --- owncloudclient-2.4.0-orig/src/gui/CMakeLists.txt 2017-12-20 18:42:11.000000000 +0100 +++ owncloudclient-2.4.0/src/gui/CMakeLists.txt 2018-02-13 22:29:10.917707151 +0100 @@ -152,10 +152,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) @@ -166,17 +162,9 @@ ) 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/QProgressIndicator - ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile ${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src - ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication ) include_directories(${3rdparty_INC}) @@ -303,6 +291,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)