|
 |
470a3fb |
diff -up rssguard-3.7.0/pri/install.pri.orig rssguard-3.7.0/pri/install.pri
|
|
|
470a3fb |
--- rssguard-3.7.0/pri/install.pri.orig 2020-07-13 11:08:38.000000000 +0200
|
|
|
470a3fb |
+++ rssguard-3.7.0/pri/install.pri 2020-07-13 17:14:04.230079995 +0200
|
|
|
1909ab4 |
@@ -113,10 +113,6 @@ INSTALL_HEADERS = \
|
|
|
1909ab4 |
../librssguard/network-web/urlinterceptor.h \
|
|
|
1909ab4 |
../librssguard/network-web/webfactory.h \
|
|
|
1909ab4 |
../librssguard/network-web/webpage.h \
|
|
|
1909ab4 |
-../librssguard/qtsingleapplication/qtlocalpeer.h \
|
|
|
1909ab4 |
-../librssguard/qtsingleapplication/qtlockedfile.h \
|
|
|
1909ab4 |
-../librssguard/qtsingleapplication/qtsingleapplication.h \
|
|
|
1909ab4 |
-../librssguard/qtsingleapplication/qtsinglecoreapplication.h \
|
|
|
1909ab4 |
../librssguard/services/abstract/accountcheckmodel.h \
|
|
|
1909ab4 |
../librssguard/services/abstract/cacheforserviceroot.h \
|
|
|
1909ab4 |
../librssguard/services/abstract/category.h \
|
|
|
470a3fb |
diff -up rssguard-3.7.0/src/librssguard/librssguard.pro.orig rssguard-3.7.0/src/librssguard/librssguard.pro
|
|
|
470a3fb |
--- rssguard-3.7.0/src/librssguard/librssguard.pro.orig 2020-07-13 11:08:38.000000000 +0200
|
|
|
470a3fb |
+++ rssguard-3.7.0/src/librssguard/librssguard.pro 2020-07-13 17:14:04.231079993 +0200
|
|
|
1909ab4 |
@@ -23,7 +23,7 @@ message($$MSG_PREFIX: lrelease executabl
|
|
|
1909ab4 |
include(../../pri/build_opts.pri)
|
|
|
1909ab4 |
|
|
|
1909ab4 |
DEFINES *= RSSGUARD_DLLSPEC=Q_DECL_EXPORT
|
|
|
1909ab4 |
-CONFIG += unversioned_libname unversioned_soname skip_target_version_ext
|
|
|
1909ab4 |
+CONFIG += unversioned_libname unversioned_soname skip_target_version_ext qtsingleapplication
|
|
|
1909ab4 |
|
|
|
1909ab4 |
RESOURCES += ../../resources/sql.qrc \
|
|
|
1909ab4 |
../../resources/rssguard.qrc \
|
|
|
470a3fb |
@@ -117,10 +117,6 @@ HEADERS += core/feeddownloader.h \
|
|
|
1909ab4 |
network-web/oauth2service.h \
|
|
|
1909ab4 |
network-web/silentnetworkaccessmanager.h \
|
|
|
1909ab4 |
network-web/webfactory.h \
|
|
|
1909ab4 |
- qtsingleapplication/qtlocalpeer.h \
|
|
|
1909ab4 |
- qtsingleapplication/qtlockedfile.h \
|
|
|
1909ab4 |
- qtsingleapplication/qtsingleapplication.h \
|
|
|
1909ab4 |
- qtsingleapplication/qtsinglecoreapplication.h \
|
|
|
1909ab4 |
services/abstract/accountcheckmodel.h \
|
|
|
1909ab4 |
services/abstract/cacheforserviceroot.h \
|
|
|
1909ab4 |
services/abstract/category.h \
|
|
|
470a3fb |
@@ -262,10 +258,6 @@ SOURCES += core/feeddownloader.cpp \
|
|
|
1909ab4 |
network-web/oauth2service.cpp \
|
|
|
1909ab4 |
network-web/silentnetworkaccessmanager.cpp \
|
|
|
1909ab4 |
network-web/webfactory.cpp \
|
|
|
1909ab4 |
- qtsingleapplication/qtlocalpeer.cpp \
|
|
|
1909ab4 |
- qtsingleapplication/qtlockedfile.cpp \
|
|
|
1909ab4 |
- qtsingleapplication/qtsingleapplication.cpp \
|
|
|
1909ab4 |
- qtsingleapplication/qtsinglecoreapplication.cpp \
|
|
|
1909ab4 |
services/abstract/accountcheckmodel.cpp \
|
|
|
1909ab4 |
services/abstract/cacheforserviceroot.cpp \
|
|
|
1909ab4 |
services/abstract/category.cpp \
|
|
|
470a3fb |
diff -up rssguard-3.7.0/src/librssguard/miscellaneous/application.cpp.orig rssguard-3.7.0/src/librssguard/miscellaneous/application.cpp
|
|
|
470a3fb |
--- rssguard-3.7.0/src/librssguard/miscellaneous/application.cpp.orig 2020-07-13 11:08:38.000000000 +0200
|
|
|
470a3fb |
+++ rssguard-3.7.0/src/librssguard/miscellaneous/application.cpp 2020-07-13 17:14:04.232079992 +0200
|
|
|
470a3fb |
@@ -486,8 +486,6 @@ void Application::onAboutToQuit() {
|
|
|
1909ab4 |
|
|
|
1909ab4 |
// Now, we can check if application should just quit or restart itself.
|
|
|
1909ab4 |
if (m_shouldRestart) {
|
|
|
1909ab4 |
- finish();
|
|
|
1909ab4 |
- qDebug("Killing local peer connection to allow another instance to start.");
|
|
|
1909ab4 |
|
|
|
470a3fb |
if (QProcess::startDetached(QDir::toNativeSeparators(applicationFilePath()), {})) {
|
|
|
1909ab4 |
qDebug("New application instance was started.");
|