Blob Blame History Raw
diff -ur falkon-3.0.1/src/lib/app/mainapplication.h falkon-3.0.1-system-qtsingleapplication/src/lib/app/mainapplication.h
--- falkon-3.0.1/src/lib/app/mainapplication.h	2018-05-08 16:18:50.000000000 +0200
+++ falkon-3.0.1-system-qtsingleapplication/src/lib/app/mainapplication.h	2018-05-10 11:36:56.227404122 +0200
@@ -23,7 +23,7 @@
 #include <QList>
 #include <QPointer>
 
-#include "qtsingleapplication/qtsingleapplication.h"
+#include <QtSolutions/qtsingleapplication.h>
 #include "restoremanager.h"
 #include "qzcommon.h"
 
diff -ur falkon-3.0.1/src/lib/CMakeLists.txt falkon-3.0.1-system-qtsingleapplication/src/lib/CMakeLists.txt
--- falkon-3.0.1/src/lib/CMakeLists.txt	2018-05-08 16:18:50.000000000 +0200
+++ falkon-3.0.1-system-qtsingleapplication/src/lib/CMakeLists.txt	2018-05-10 11:37:56.437508311 +0200
@@ -3,11 +3,6 @@
 set(CMAKE_CXX_STANDARD 14) # Enable C++14, with cmake >= 3.1
 set(CMAKE_CXX_EXTENSIONS OFF) # Don't enable gcc-specific extensions
 
-set(SRCS
-    3rdparty/qtsingleapplication/qtsingleapplication.cpp
-    3rdparty/qtsingleapplication/qtlocalpeer.cpp
-)
-
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(SRCS ${SRCS} ${CMAKE_SOURCE_DIR}/tests/modeltest/modeltest.cpp)
     include_directories(${CMAKE_SOURCE_DIR}/tests/modeltest)
@@ -305,6 +300,7 @@
     Qt5::PrintSupport
     Qt5::QuickWidgets
     Qt5::WebChannel
+    Qt5Solutions_SingleApplication-2.6
     ${OPENSSL_CRYPTO_LIBRARY}
 )
 
diff -ur falkon-3.0.1/src/plugins/PyFalkon/pyfalkon_global.h falkon-3.0.1-system-qtsingleapplication/src/plugins/PyFalkon/pyfalkon_global.h
--- falkon-3.0.1/src/plugins/PyFalkon/pyfalkon_global.h	2018-05-08 16:18:50.000000000 +0200
+++ falkon-3.0.1-system-qtsingleapplication/src/plugins/PyFalkon/pyfalkon_global.h	2018-05-10 11:36:56.332402560 +0200
@@ -23,7 +23,7 @@
 #include "lineedit.h"
 #include "squeezelabelv1.h"
 #include "squeezelabelv2.h"
-#include "qtsingleapplication/qtsingleapplication.h"
+#include <QtSolutions/qtsingleapplication.h>
 
 // app
 #include "autosaver.h"
diff -ur falkon-3.0.1/src/plugins/PyFalkon/pyfalkon.xml falkon-3.0.1-system-qtsingleapplication/src/plugins/PyFalkon/pyfalkon.xml
--- falkon-3.0.1/src/plugins/PyFalkon/pyfalkon.xml	2018-05-08 16:18:50.000000000 +0200
+++ falkon-3.0.1-system-qtsingleapplication/src/plugins/PyFalkon/pyfalkon.xml	2018-05-10 11:36:56.409401414 +0200
@@ -22,7 +22,7 @@
     <object-type name="SqueezeLabelV1"/>
     <object-type name="SqueezeLabelV2"/>
     <object-type name="QtSingleApplication">
-      <include file-name="qtsingleapplication/qtsingleapplication.h" location="global"/>
+      <include file-name="QtSolutions/qtsingleapplication.h" location="global"/>
       <modify-function signature="QtSingleApplication(int&amp;,char**,bool)" remove="all"/>
       <modify-function signature="QtSingleApplication(QString,int&amp;,char**)" remove="all"/>
     </object-type>