--- src/gui/application.h~ 2019-03-18 04:08:22.000000000 -0500
+++ src/gui/application.h 2019-06-12 15:33:55.941943652 -0500
@@ -22,7 +22,7 @@
#include <QElapsedTimer>
#include <QNetworkConfigurationManager>
-#include "qtsingleapplication.h"
+#include <QtSolutions/qtsingleapplication.h>
#include "syncresult.h"
#include "logbrowser.h"
--- src/3rdparty/qtsingleapplication/qtlocalpeer.h~ 2019-03-18 04:08:22.000000000 -0500
+++ src/3rdparty/qtsingleapplication/qtlocalpeer.h 2019-06-12 16:15:19.083450495 -0500
@@ -27,7 +27,7 @@
**
****************************************************************************/
-#include <qtlockedfile.h>
+#include <QTSolutions/qtlockedfile.h>
#include <QLocalServer>
#include <QLocalSocket>
--- src/gui/application.cpp~ 2019-03-18 04:08:22.000000000 -0500
+++ src/gui/application.cpp 2019-06-12 16:16:39.396142159 -0500
@@ -157,7 +157,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)
--- src/gui/application.cpp~ 2019-06-12 16:16:39.000000000 -0500
+++ src/gui/application.cpp 2019-06-12 16:17:37.579918781 -0500
@@ -254,7 +254,7 @@
_folderManager.reset(new FolderMan);
- connect(this, &SharedTools::QtSingleApplication::messageReceived, this, &Application::slotParseMessage);
+ connect(this, &QtSingleApplication::messageReceived, this, &Application::slotParseMessage);
if (!AccountManager::instance()->restore()) {
// If there is an error reading the account settings, try again
--- src/gui/application.cpp~ 2019-06-12 16:17:37.000000000 -0500
+++ src/gui/application.cpp 2019-06-12 16:19:07.878572107 -0500
@@ -487,7 +487,7 @@
_gui->slotComputeOverallSyncStatus();
}
-void Application::slotParseMessage(const QString &msg, QObject *)
+void Application::slotParseMessage(const QString &msg)
{
if (msg.startsWith(QLatin1String("MSG_PARSEOPTIONS:"))) {
const int lengthOfMsgPrefix = 17;
--- src/gui/application.h~ 2019-03-18 04:08:22.000000000 -0500
+++ src/gui/application.h 2019-06-12 16:20:21.895287942 -0500
@@ -52,7 +52,7 @@
* @brief The Application class
* @ingroup gui
*/
-class Application : public SharedTools::QtSingleApplication
+class Application : public QtSingleApplication
{
Q_OBJECT
public:
@@ -94,7 +94,7 @@
void folderStateChanged(Folder *);
protected slots:
- void slotParseMessage(const QString &, QObject *);
+ void slotParseMessage(const QString &);
void slotCheckConnection();
void slotUseMonoIconsChanged(bool);
void slotCleanup();
--- src/gui/CMakeLists.txt~ 2019-03-18 04:08:22.000000000 -0500
+++ src/gui/CMakeLists.txt 2019-06-12 16:21:29.097029941 -0500
@@ -285,6 +285,8 @@
target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
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} )
target_include_directories(${APPLICATION_EXECUTABLE} PRIVATE
--- src/gui/application.cpp~ 2019-06-12 16:21:48.000000000 -0500
+++ src/gui/application.cpp 2019-06-12 16:24:35.505314285 -0500
@@ -759,7 +759,7 @@
QTimer::singleShot(0, this, [this, fn] { openVirtualFile(fn); });
}
#endif
- return SharedTools::QtSingleApplication::event(event);
+ return QtSingleApplication::event(event);
}
} // namespace OCC
--- src/gui/CMakeLists.txt~ 2019-11-20 18:11:30.000000000 -0600
+++ src/gui/CMakeLists.txt 2019-11-20 18:15:32.367903089 -0600
@@ -150,18 +150,8 @@
set(3rdparty_SRC
../3rdparty/QProgressIndicator/QProgressIndicator.cpp
- ../3rdparty/qtlockedfile/qtlockedfile.cpp
- ../3rdparty/qtsingleapplication/qtlocalpeer.cpp
- ../3rdparty/qtsingleapplication/qtsingleapplication.cpp
- ../3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
)
-if(NOT WIN32)
- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_unix.cpp)
-else()
- list(APPEND 3rdparty_SRC ../3rdparty/qtlockedfile/qtlockedfile_win.cpp )
-endif()
-
find_package(Qt5LinguistTools)
if(Qt5LinguistTools_FOUND)