[Pkg-owncloud-commits] [owncloud-client] 35/175: Application: Disable to workaround of QLockFile bug for Qt versions that are fixed

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit dd5a49bc7881d0bdb1259f14070320237aeb9cd5
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue May 12 17:25:45 2015 +0200

    Application: Disable to workaround of QLockFile bug for Qt versions that are fixed
---
 src/gui/application.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index c23609b..0e4eaa0 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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git