ExtensionSystem: Add support for static plugins

Loads all plugins that are known via Q_IMPORT_PLUGIN()

Change-Id: I3c1fe223ce6e4dcdb7729f5ab3e782e78bca5afc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

src/libs/extensionsystem/pluginmanager.cpp

@@ -1694,11 +1694,20 @@ void PluginManagerPrivate::readPluginPaths()
     // default
     pluginCategories.insert(QString(), QVector<PluginSpec *>());
 
+    // from the file system
     for (const QString &pluginFile : pluginFiles(pluginPaths)) {
         PluginSpec *spec = PluginSpec::read(pluginFile);
-        if (!spec) // not a Qt Creator plugin
+        if (spec) // Qt Creator plugin
-            continue;
+            pluginSpecs.append(spec);
+    }
+    // static
+    for (const QStaticPlugin &plugin : QPluginLoader::staticPlugins()) {
+        PluginSpec *spec = PluginSpec::read(plugin);
+        if (spec) // Qt Creator plugin
+            pluginSpecs.append(spec);
+    }
 
+    for (PluginSpec *spec : pluginSpecs) {
         // defaultDisabledPlugins and defaultEnabledPlugins from install settings
         // is used to override the defaults read from the plugin spec
         if (spec->isEnabledByDefault() && defaultDisabledPlugins.contains(spec->name())) {
@@ -1714,7 +1723,6 @@ void PluginManagerPrivate::readPluginPaths()
             spec->d->setEnabledBySettings(false);
 
         pluginCategories[spec->category()].append(spec);
-        pluginSpecs.append(spec);
     }
     resolveDependencies();
     enableDependenciesIndirectly();

src/libs/extensionsystem/pluginspec.cpp

@@ -558,6 +558,16 @@ PluginSpec *PluginSpec::read(const QString &filePath)
     return spec;
 }
 
+PluginSpec *PluginSpec::read(const QStaticPlugin &plugin)
+{
+    auto spec = new PluginSpec;
+    if (!spec->d->read(plugin)) { // not a Qt Creator plugin
+        delete spec;
+        return nullptr;
+    }
+    return spec;
+}
+
 //==========PluginSpecPrivate==================
 
 namespace {
@@ -592,9 +602,28 @@ namespace {
 */
 PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec)
     : q(spec)
+{}
+
+void PluginSpecPrivate::reset()
 {
-    if (Utils::HostOsInfo::isMacHost())
+    name.clear();
-        loader.setLoadHints(QLibrary::ExportExternalSymbolsHint);
+    version.clear();
+    compatVersion.clear();
+    vendor.clear();
+    copyright.clear();
+    license.clear();
+    description.clear();
+    url.clear();
+    category.clear();
+    location.clear();
+    filePath.clear();
+    state = PluginSpec::Invalid;
+    hasError = false;
+    errorString.clear();
+    dependencies.clear();
+    metaData = QJsonObject();
+    loader.reset();
+    staticPlugin.reset();
 }
 
 /*!
@@ -604,32 +633,32 @@ PluginSpecPrivate::PluginSpecPrivate(PluginSpec *spec)
 bool PluginSpecPrivate::read(const QString &fileName)
 {
     qCDebug(pluginLog) << "\nReading meta data of" << fileName;
-    name
+    reset();
-        = version
-        = compatVersion
-        = vendor
-        = copyright
-        = license
-        = description
-        = url
-        = category
-        = location
-        = QString();
-    state = PluginSpec::Invalid;
-    hasError = false;
-    errorString.clear();
-    dependencies.clear();
-    metaData = QJsonObject();
     QFileInfo fileInfo(fileName);
     location = fileInfo.absolutePath();
     filePath = fileInfo.absoluteFilePath();
-    loader.setFileName(filePath);
+    loader.emplace();
-    if (loader.fileName().isEmpty()) {
+    if (Utils::HostOsInfo::isMacHost())
+        loader->setLoadHints(QLibrary::ExportExternalSymbolsHint);
+    loader->setFileName(filePath);
+    if (loader->fileName().isEmpty()) {
         qCDebug(pluginLog) << "Cannot open file";
         return false;
     }
 
-    if (!readMetaData(loader.metaData()))
+    if (!readMetaData(loader->metaData()))
+        return false;
+
+    state = PluginSpec::Read;
+    return true;
+}
+
+bool PluginSpecPrivate::read(const QStaticPlugin &plugin)
+{
+    qCDebug(pluginLog) << "\nReading meta data of static plugin";
+    reset();
+    staticPlugin = plugin;
+    if (!readMetaData(plugin.metaData()))
         return false;
 
     state = PluginSpec::Read;
@@ -1050,17 +1079,19 @@ bool PluginSpecPrivate::loadLibrary()
         hasError = true;
         return false;
     }
-    if (!loader.load()) {
+    if (loader && !loader->load()) {
         hasError = true;
-        errorString = QDir::toNativeSeparators(filePath)
+        errorString = QDir::toNativeSeparators(filePath) + QString::fromLatin1(": ")
-            + QString::fromLatin1(": ") + loader.errorString();
+                      + loader->errorString();
         return false;
     }
-    auto *pluginObject = qobject_cast<IPlugin*>(loader.instance());
+    auto *pluginObject = loader ? qobject_cast<IPlugin *>(loader->instance())
+                                : qobject_cast<IPlugin *>(staticPlugin->instance());
     if (!pluginObject) {
         hasError = true;
         errorString = QCoreApplication::translate("PluginSpec", "Plugin is not valid (does not derive from IPlugin)");
-        loader.unload();
+        if (loader)
+            loader->unload();
         return false;
     }
     state = PluginSpec::Loaded;

src/libs/extensionsystem/pluginspec.h

@@ -29,8 +29,9 @@
 
 #include <utils/porting.h>
 
-#include <QString>
 #include <QHash>
+#include <QStaticPlugin>
+#include <QString>
 #include <QVector>
 
 QT_BEGIN_NAMESPACE
@@ -135,6 +136,7 @@ public:
     void setEnabledBySettings(bool value);
 
     static PluginSpec *read(const QString &filePath);
+    static PluginSpec *read(const QStaticPlugin &plugin);
 
 private:
     PluginSpec();

src/libs/extensionsystem/pluginspec_p.h

@@ -28,6 +28,8 @@
 #include "pluginspec.h"
 #include "iplugin.h"
 
+#include <utils/optional.h>
+
 #include <QJsonObject>
 #include <QObject>
 #include <QPluginLoader>
@@ -50,7 +52,9 @@ class EXTENSIONSYSTEM_EXPORT PluginSpecPrivate : public QObject
 public:
     PluginSpecPrivate(PluginSpec *spec);
 
+    void reset();
     bool read(const QString &fileName);
+    bool read(const QStaticPlugin &plugin);
     bool provides(const QString &pluginName, const QString &version) const;
     bool resolveDependencies(const QVector<PluginSpec *> &specs);
     bool loadLibrary();
@@ -65,7 +69,8 @@ public:
     void setForceEnabled(bool value);
     void setForceDisabled(bool value);
 
-    QPluginLoader loader;
+    Utils::optional<QPluginLoader> loader;
+    Utils::optional<QStaticPlugin> staticPlugin;
 
     QString name;
     QString version;