Allow scanner plugins to be built statically

Scanner plugins will now also be built statically when Qbs is built
against a static Qt, enabling single-binary distributions.

Change-Id: Id2587b79815bcc6d9ec569f5b168445fe7e843d3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp
index 83c1dfcaa..12e38c1de 100644
--- a/src/lib/corelib/tools/scannerpluginmanager.cpp
+++ b/src/lib/corelib/tools/scannerpluginmanager.cpp
@@ -73,6 +73,12 @@ QList<ScannerPlugin *> ScannerPluginManager::scannersForFileTag(const FileTag &f
     return instance()->m_scannerPlugins.value(fileTag);
 }
 
+void ScannerPluginManager::loadPlugins(ScannerPlugin **plugins)
+{
+    for (int i = 0; plugins[i] != 0; ++i)
+        m_scannerPlugins[FileTag(plugins[i]->fileTag)] += plugins[i];
+}
+
 void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Logger &logger)
 {
     QStringList filters;
@@ -114,8 +120,7 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log
             logger.qbsTrace() << QString::fromLatin1("pluginmanager: scanner plugin '%1' loaded.")
                                  .arg(QDir::toNativeSeparators(fileName));
 
-            for (int i = 0; plugins[i] != 0; ++i)
-                m_scannerPlugins[FileTag(plugins[i]->fileTag)] += plugins[i];
+            loadPlugins(plugins);
             m_libs.append(lib.take());
         }
     }