18 lines
657 B
Diff
18 lines
657 B
Diff
|
Calling qsettings before constructing qapplications causes a dead-lock.
|
||
|
|
|
||
|
|
http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932
|
||
|
|
http://developer.qt.nokia.com/forums/viewthread/10365
|
||
|
|
|
||
|
|
|
||
|
|
--- a/src/corelib/io/qsettings.cpp.orig
|
||
|
|
+++ b/src/corelib/io/qsettings.cpp
|
||
|
|
@@ -122,7 +122,7 @@
|
||
|
|
Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc)
|
||
|
|
Q_GLOBAL_STATIC(PathHash, pathHashFunc)
|
||
|
|
Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc)
|
||
|
|
-Q_GLOBAL_STATIC(QMutex, globalMutex)
|
||
|
|
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive))
|
||
|
|
static QSettings::Format globalDefaultFormat = QSettings::NativeFormat;
|
||
|
|
|
||
|
|
#ifndef Q_OS_WIN
|