diff options
| author | mae <qt-info@nokia.com> | 2011-05-02 09:56:03 (GMT) |
|---|---|---|
| committer | mae <qt-info@nokia.com> | 2011-05-02 09:58:43 (GMT) |
| commit | 988871dabf3c949ffc71d126131281a3ae641ebf (patch) | |
| tree | ce144516ac0083ea559e51b755370c64dd64798f /src/corelib/plugin | |
| parent | 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5 (diff) | |
| download | Qt-988871dabf3c949ffc71d126131281a3ae641ebf.zip Qt-988871dabf3c949ffc71d126131281a3ae641ebf.tar.gz Qt-988871dabf3c949ffc71d126131281a3ae641ebf.tar.bz2 | |
Fix regression with QSettings patch
The plugin loader is used without QCoreApplication.
This fixes 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5
Diffstat (limited to 'src/corelib/plugin')
| -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 6f3ee1c..d9aac00 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 |