Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2a54058b64ac69c78b4120fdaf09b96e025a4c6c

1 files changed, 5 insertions, 4 deletions

diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index 6303f5cbe1..d202d62957 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -104,6 +104,10 @@ static inline QStringList systemIconSearchPaths()
     return QStringList();
 }
 
+#ifndef QT_NO_LIBRARY
+extern QFactoryLoader *qt_iconEngineFactoryLoader(); // qicon.cpp
+#endif
+
 void QIconLoader::ensureInitialized()
 {
     if (!m_initialized) {
@@ -116,10 +120,7 @@ void QIconLoader::ensureInitialized()
         if (m_systemTheme.isEmpty())
             m_systemTheme = fallbackTheme();
 #ifndef QT_NO_LIBRARY
-        QFactoryLoader iconFactoryLoader(QIconEngineFactoryInterface_iid,
-                                         QLatin1String("/iconengines"),
-                                         Qt::CaseInsensitive);
-        if (iconFactoryLoader.keyMap().key(QLatin1String("svg"), -1) != -1)
+        if (qt_iconEngineFactoryLoader()->keyMap().key(QLatin1String("svg"), -1) != -1)
             m_supportsSvg = true;
 #endif //QT_NO_LIBRARY
     }