|
 |
bb0f039 |
diff -ur owncloudclient-2.1.0.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h owncloudclient-2.1.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h
|
|
|
bb0f039 |
--- owncloudclient-2.1.0.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2015-12-03 10:19:51.000000000 +0100
|
|
|
bb0f039 |
+++ owncloudclient-2.1.0/src/3rdparty/qtsingleapplication/qtlocalpeer.h 2015-12-04 11:44:30.631090122 +0100
|
|
|
bb0f039 |
@@ -27,7 +27,7 @@
|
|
|
bb0f039 |
**
|
|
|
bb0f039 |
****************************************************************************/
|
|
|
bb0f039 |
|
|
|
bb0f039 |
-#include <qtlockedfile.h>
|
|
|
8cb3e9e |
+#include <qt5/QTSolutions/qtlockedfile.h>
|
|
|
bb0f039 |
|
|
|
bb0f039 |
#include <QLocalServer>
|
|
|
bb0f039 |
#include <QLocalSocket>
|
|
|
bb0f039 |
diff -ur owncloudclient-2.1.0.orig/src/gui/application.cpp owncloudclient-2.1.0/src/gui/application.cpp
|
|
|
bb0f039 |
--- owncloudclient-2.1.0.orig/src/gui/application.cpp 2015-12-03 10:19:51.000000000 +0100
|
|
|
bb0f039 |
+++ owncloudclient-2.1.0/src/gui/application.cpp 2015-12-04 11:45:18.953025851 +0100
|
|
|
bb0f039 |
@@ -92,7 +92,7 @@
|
|
|
bb0f039 |
// ----------------------------------------------------------------------------------
|
|
|
bb0f039 |
|
|
|
bb0f039 |
Application::Application(int &argc, char **argv) :
|
|
|
bb0f039 |
- SharedTools::QtSingleApplication(Theme::instance()->appName() ,argc, argv),
|
|
|
bb0f039 |
+ QtSingleApplication(Theme::instance()->appName() ,argc, argv),
|
|
|
bb0f039 |
_gui(0),
|
|
|
bb0f039 |
_theme(Theme::instance()),
|
|
|
bb0f039 |
_helpOnly(false),
|
|
|
bb0f039 |
diff -ur owncloudclient-2.1.0.orig/src/gui/application.h owncloudclient-2.1.0/src/gui/application.h
|
|
|
bb0f039 |
--- owncloudclient-2.1.0.orig/src/gui/application.h 2015-12-03 10:19:51.000000000 +0100
|
|
|
bb0f039 |
+++ owncloudclient-2.1.0/src/gui/application.h 2015-12-04 11:46:13.820817409 +0100
|
|
|
bb0f039 |
@@ -22,7 +22,7 @@
|
|
|
bb0f039 |
#include <QElapsedTimer>
|
|
|
bb0f039 |
#include <QNetworkConfigurationManager>
|
|
|
bb0f039 |
|
|
|
bb0f039 |
-#include "qtsingleapplication.h"
|
|
|
8cb3e9e |
+#include "qt5/QtSolutions/QtSingleApplication"
|
|
|
bb0f039 |
|
|
|
bb0f039 |
#include "syncresult.h"
|
|
|
bb0f039 |
#include "logbrowser.h"
|
|
|
bb0f039 |
@@ -49,7 +49,7 @@
|
|
|
bb0f039 |
* @brief The Application class
|
|
|
bb0f039 |
* @ingroup gui
|
|
|
bb0f039 |
*/
|
|
|
bb0f039 |
-class Application : public SharedTools::QtSingleApplication
|
|
|
bb0f039 |
+class Application : public QtSingleApplication
|
|
|
bb0f039 |
{
|
|
|
bb0f039 |
Q_OBJECT
|
|
|
bb0f039 |
public:
|
|
|
bb0f039 |
diff -ur owncloudclient-2.1.0.orig/src/gui/CMakeLists.txt owncloudclient-2.1.0/src/gui/CMakeLists.txt
|
|
|
bb0f039 |
--- owncloudclient-2.1.0.orig/src/gui/CMakeLists.txt 2015-12-03 10:19:51.000000000 +0100
|
|
|
bb0f039 |
+++ owncloudclient-2.1.0/src/gui/CMakeLists.txt 2015-12-04 11:48:31.325788916 +0100
|
|
|
bb0f039 |
@@ -135,10 +135,6 @@
|
|
|
bb0f039 |
set(3rdparty_SRC
|
|
|
bb0f039 |
../3rdparty/fancylineedit/fancylineedit.cpp
|
|
|
bb0f039 |
../3rdparty/QProgressIndicator/QProgressIndicator.cpp
|
|
|
bb0f039 |
- ../3rdparty/qtlockedfile/qtlockedfile.cpp
|
|
|
bb0f039 |
- ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
|
|
|
bb0f039 |
- ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
|
|
|
bb0f039 |
- ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
|
|
|
bb0f039 |
../3rdparty/certificates/p12topem.cpp
|
|
|
bb0f039 |
)
|
|
|
bb0f039 |
|
|
|
bb0f039 |
@@ -150,19 +146,11 @@
|
|
|
bb0f039 |
)
|
|
|
bb0f039 |
endif()
|
|
|
bb0f039 |
|
|
|
bb0f039 |
-if(NOT WIN32)
|
|
|
bb0f039 |
- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
|
|
|
bb0f039 |
-else()
|
|
|
bb0f039 |
- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
|
|
|
bb0f039 |
-endif()
|
|
|
bb0f039 |
-
|
|
|
bb0f039 |
set(3rdparty_INC
|
|
|
bb0f039 |
${CMAKE_SOURCE_DIR}/src/3rdparty/fancylineedit
|
|
|
bb0f039 |
${CMAKE_SOURCE_DIR}/src/3rdparty/qjson
|
|
|
bb0f039 |
${CMAKE_SOURCE_DIR}/src/3rdparty/QProgressIndicator
|
|
|
bb0f039 |
- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtlockedfile
|
|
|
bb0f039 |
${CMAKE_SOURCE_DIR}/src/3rdparty/qtmacgoodies/src
|
|
|
bb0f039 |
- ${CMAKE_SOURCE_DIR}/src/3rdparty/qtsingleapplication
|
|
|
bb0f039 |
)
|
|
|
bb0f039 |
|
|
|
bb0f039 |
include_directories(${3rdparty_INC})
|
|
|
bb0f039 |
@@ -281,6 +269,8 @@
|
|
|
bb0f039 |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
|
|
|
bb0f039 |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
|
|
|
bb0f039 |
target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
|
|
|
c9ec4e6 |
+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_LockedFile-2.4 )
|
|
|
c9ec4e6 |
+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5Solutions_SingleApplication-2.6 )
|
|
|
bb0f039 |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
|
|
|
bb0f039 |
|
|
|
bb0f039 |
if(WITH_CRASHREPORTER)
|