diff options
| author | mae <qt-info@nokia.com> | 2011-05-02 11:56:03 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:53 +0200 |
| commit | 42452a32bfea29bf8176d19442f6e3c890c2b7e2 (patch) | |
| tree | ccf32bee3dba2a6bf3d40ec44667b9032e4bd0df /src/corelib/plugin/qlibrary.cpp | |
| parent | c0da3003df9e0a70121e10dc6fa9ae54cf13ecfe (diff) | |
Fix regression with QSettings patch
The plugin loader is used without QCoreApplication.
This fixes 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5
(cherry picked from commit 988871dabf3c949ffc71d126131281a3ae641ebf)
Diffstat (limited to 'src/corelib/plugin/qlibrary.cpp')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 6f3ee1c3d3..d9aac00cf1 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -706,7 +706,7 @@ bool QLibraryPrivate::isPlugin(QSettings *settings) QStringList reg; #ifndef QT_NO_SETTINGS if (!settings) { - settings = QCoreApplicationPrivate::trolltechConf; + settings = QCoreApplicationPrivate::trolltechConf(); } reg = settings->value(regkey).toStringList(); #endif |