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:
4d3a0ed
)
Application: ifdef lock file issue as it only happens on Qt>5.1
author
Klaas Freitag
<freitag@owncloud.com>
Mon, 11 May 2015 11:35:04 +0000
(13:35 +0200)
committer
Klaas Freitag
<freitag@owncloud.com>
Mon, 11 May 2015 11:35:04 +0000
(13:35 +0200)
However, the fix breaks Qt4 compile, so it needs to be ifdefed.
Not viel hilft viel.
src/gui/application.cpp
patch
|
blob
|
history
diff --git
a/src/gui/application.cpp
b/src/gui/application.cpp
index 911fe7e346ddcf4c85d9ce6d4d356a2f4b051142..c23609b7027bb7384c3fd4ff4652cb6d99104d31 100644
(file)
--- 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())