From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 12 May 2015 15:25:45 +0000 (+0200)
Subject: Application: Disable to workaround of QLockFile bug for Qt versions that are fixed
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1803^2~97
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dd5a49bc7881d0bdb1259f14070320237aeb9cd5;p=nextcloud-desktop.git

Application: Disable to workaround of QLockFile bug for Qt versions that are fixed
---

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index c23609b70..0e4eaa0ed 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -110,9 +110,9 @@ Application::Application(int &argc, char **argv) :
     if (isRunning())
         return;
 
-#if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2)
     // Workaround for QTBUG-44576: Make sure a stale QSettings lock file
-    // is deleted.
+    // is deleted. (Introduced in Qt 5.4.0 and fixed in Qt 5.4.2)
     {
         QString lockFilePath = ConfigFile().configFile() + QLatin1String(".lock");
         QLockFile(lockFilePath).removeStaleLockFile();