Attachment 937297 Details for Bug 1103162 – Updated syslibs patch

[patch] Updated syslibs patch

mirall-1.7.0-beta1-syslibs.patch (text/plain), 3.84 KB, created by Dams on 2014-09-14 09:52:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dams

Created: 2014-09-14 09:52:51 UTC

Size: 3.84 KB

patch

obsolete

>diff -u --exclude CVS --exclude .svn --exclude .bzr -r mirall-1.7.0-beta1.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h mirall-1.7.0-beta1/src/3rdparty/qtsingleapplication/qtlocalpeer.h
>--- mirall-1.7.0-beta1.orig/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2014-08-22 07:25:19.000000000 +0200
>+++ mirall-1.7.0-beta1/src/3rdparty/qtsingleapplication/qtlocalpeer.h	2014-09-13 14:00:47.634721690 +0200
>@@ -27,7 +27,7 @@
> **
> ****************************************************************************/
> 
>-#include <qtlockedfile.h>
>+#include <QtSolutions/qtlockedfile.h>
> 
> #include <QLocalServer>
> #include <QLocalSocket>
>diff -u --exclude CVS --exclude .svn --exclude .bzr -r mirall-1.7.0-beta1.orig/src/CMakeLists.txt mirall-1.7.0-beta1/src/CMakeLists.txt
>--- mirall-1.7.0-beta1.orig/src/CMakeLists.txt	2014-08-22 07:25:19.000000000 +0200
>+++ mirall-1.7.0-beta1/src/CMakeLists.txt	2014-09-13 14:08:05.740360505 +0200
>@@ -33,10 +33,6 @@
> endif()
> 
> set(3rdparty_SRC
>-3rdparty/qtsingleapplication/qtsingleapplication.cpp
>-3rdparty/qtsingleapplication/qtlocalpeer.cpp
>-3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
>-3rdparty/qtlockedfile/qtlockedfile.cpp
> 3rdparty/fancylineedit/fancylineedit.cpp
> 3rdparty/QProgressIndicator/QProgressIndicator.cpp
> )
>@@ -49,15 +45,7 @@
>         )
> 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_CURRENT_SOURCE_DIR}/3rdparty/qtlockedfile
>-    ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication
>     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/QProgressIndicator
>     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/fancylineedit
>     ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qjson
>@@ -393,6 +381,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} QtSolutions_LockedFile-2.4 )
>+  target_link_libraries( ${APPLICATION_EXECUTABLE} QtSolutions_SingleApplication-2.6 )
>   target_link_libraries( ${APPLICATION_EXECUTABLE} ${OS_SPECIFIC_LINK_LIBRARIES} )
> 
>   install(TARGETS ${APPLICATION_EXECUTABLE}
>diff -u --exclude CVS --exclude .svn --exclude .bzr -r mirall-1.7.0-beta1.orig/src/mirall/application.cpp mirall-1.7.0-beta1/src/mirall/application.cpp
>--- mirall-1.7.0-beta1.orig/src/mirall/application.cpp	2014-08-22 07:25:19.000000000 +0200
>+++ mirall-1.7.0-beta1/src/mirall/application.cpp	2014-09-13 14:09:43.857487953 +0200
>@@ -79,7 +79,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),
>@@ -480,7 +480,7 @@
>         return true;
>     }
> 
>-    return SharedTools::QtSingleApplication::winEventFilter(pMsg, result);
>+    return QtSingleApplication::winEventFilter(pMsg, result);
> }
> #endif
> 
>diff -u --exclude CVS --exclude .svn --exclude .bzr -r mirall-1.7.0-beta1.orig/src/mirall/application.h mirall-1.7.0-beta1/src/mirall/application.h
>--- mirall-1.7.0-beta1.orig/src/mirall/application.h	2014-08-22 07:25:19.000000000 +0200
>+++ mirall-1.7.0-beta1/src/mirall/application.h	2014-09-13 14:10:23.378733696 +0200
>@@ -20,7 +20,7 @@
> #include <QQueue>
> #include <QTimer>
> 
>-#include "qtsingleapplication.h"
>+#include "QtSolutions/QtSingleApplication"
> 
> #include "mirall/syncresult.h"
> #include "mirall/logbrowser.h"
>@@ -39,7 +39,7 @@
> class Folder;
> class SslErrorDialog;
> 
>-class Application : public SharedTools::QtSingleApplication
>+class Application : public QtSingleApplication
> {
>     Q_OBJECT
> public:

Actions: View | Diff

Attachments on bug 1103162: 937297 | 937298 | 937299 | 945095