From 988871dabf3c949ffc71d126131281a3ae641ebf Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Mon, 2 May 2011 11:56:03 +0200
Subject: Fix regression with QSettings patch

The plugin loader is used without QCoreApplication.
This fixes 31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5
---
 src/corelib/plugin/qlibrary.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/plugin')

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
-- 
cgit v1.2.3