parent
ba6acf2818
commit
c487f0c386
@ -0,0 +1,86 @@
|
||||
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 <qtlockedfile.h>
|
||||
+#include <QTSolutions/qtlockedfile.h>
|
||||
|
||||
#include <QLocalServer>
|
||||
#include <QLocalSocket>
|
||||
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 <QElapsedTimer>
|
||||
#include <QNetworkConfigurationManager>
|
||||
|
||||
-#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)
|
@ -1,2 +1 @@
|
||||
SHA512 (owncloudclient-2.3.3.tar.xz) = 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
|
||||
SHA512 (v2.3.2.tar.gz) = 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628
|
||||
SHA512 (owncloudclient-2.4.0.tar.xz) = b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
|
||||
|
Loading…
Reference in new issue