[Pkg-owncloud-commits] [owncloud-client] 27/175: Application: ifdef lock file issue as it only happens on Qt>5.1

[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 41614ec85177fb73a39bd1aab5ae6615c67985d2
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon May 11 13:35:04 2015 +0200

    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.
---
 src/gui/application.cpp | 2 ++
 1 file changed, 2 insertions(+)

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

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