diff options
Diffstat (limited to 'main/qt/qsettings-recursive-global-mutex.patch')
| -rw-r--r-- | main/qt/qsettings-recursive-global-mutex.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/main/qt/qsettings-recursive-global-mutex.patch b/main/qt/qsettings-recursive-global-mutex.patch new file mode 100644 index 0000000000..229123c54f --- /dev/null +++ b/main/qt/qsettings-recursive-global-mutex.patch @@ -0,0 +1,17 @@ +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 + + +--- ./src/corelib/io/qsettings.cpp.orig ++++ ./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 |