From: Klaas Freitag Date: Mon, 11 May 2015 11:35:04 +0000 (+0200) Subject: Application: ifdef lock file issue as it only happens on Qt>5.1 X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1803^2~105 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41614ec85177fb73a39bd1aab5ae6615c67985d2;p=nextcloud-desktop.git Application: ifdef lock file issue as it only happens on Qt>5.1 However, the fix breaks Qt4 compile, so it needs to be ifdefed. Not viel hilft viel. --- diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 911fe7e34..c23609b70 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -110,12 +110,14 @@ Application::Application(int &argc, char **argv) : if (isRunning()) return; +#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0) // Workaround for QTBUG-44576: Make sure a stale QSettings lock file // is deleted. { QString lockFilePath = ConfigFile().configFile() + QLatin1String(".lock"); QLockFile(lockFilePath).removeStaleLockFile(); } +#endif #if defined(WITH_CRASHREPORTER) if (ConfigFile().crashReporter())