projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdfafa2
)
Application: Disable to workaround of QLockFile bug for Qt versions that are fixed
author
Olivier Goffart
<ogoffart@woboq.com>
Tue, 12 May 2015 15:25:45 +0000
(17:25 +0200)
committer
Olivier Goffart
<ogoffart@woboq.com>
Tue, 12 May 2015 15:26:32 +0000
(17:26 +0200)
src/gui/application.cpp
patch
|
blob
|
history
diff --git
a/src/gui/application.cpp
b/src/gui/application.cpp
index c23609b7027bb7384c3fd4ff4652cb6d99104d31..0e4eaa0edb248efc65da198efcc6bc5eb9d67970 100644
(file)
--- 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();