Fix static build

Fix all issues preventing static build:
- make sure plugins are built statically by removing CONFIG += dll
- add classname to all qmldirs
- unify structure and the naming of all plugin classes
- initialize resources in the plugins
- explicitly include qtvirtualkeyboard plugin in the build

Task-number: QTBUG-68988
Change-Id: I38cdbaae49dd198559be6c9fcd0b8d15a3979e4d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>

11 files changed, 11 insertions, 9 deletions

diff --git a/src/imports/bluetoothsettings/qmldir b/src/imports/bluetoothsettings/qmldir
index 3b5b45e..f0c15f5 100644
--- a/src/imports/bluetoothsettings/qmldir
+++ b/src/imports/bluetoothsettings/qmldir
@@ -1,3 +1,4 @@
 module QtDeviceUtilities.BluetoothSettings
 plugin btsettingsplugin
+classname BluetoothSettingsQmlPlugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/displaysettings/plugin.cpp b/src/imports/displaysettings/plugin.cpp
index fd88a1a..601b8e0 100644
--- a/src/imports/displaysettings/plugin.cpp
+++ b/src/imports/displaysettings/plugin.cpp
@@ -93,7 +93,7 @@ QObject *instance(QQmlEngine *engine, QJSEngine *) {
     return t;
 }
 
-class GeneralSettingsQmlPlugin : public QQmlExtensionPlugin
+class DisplaySettingsQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
diff --git a/src/imports/displaysettings/qmldir b/src/imports/displaysettings/qmldir
index 4576519..1bfbe93 100644
--- a/src/imports/displaysettings/qmldir
+++ b/src/imports/displaysettings/qmldir
@@ -1,3 +1,4 @@
 module QtDeviceUtilities.DisplaySettings
 plugin qmldisplaysettingsplugin
+classname DisplaySettingsQmlPlugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp
index 785b364..506c6f6 100644
--- a/src/imports/localdevice/plugin.cpp
+++ b/src/imports/localdevice/plugin.cpp
@@ -96,16 +96,12 @@ static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
    return api;
 }
 
-class B2QtUtilsPlugin : public QQmlExtensionPlugin
+class LocalDeviceSettingsQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    B2QtUtilsPlugin()
-    {
-    }
-
     void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == "QtDeviceUtilities.LocalDeviceSettings");
diff --git a/src/imports/localdevice/qmldir b/src/imports/localdevice/qmldir
index 1d9791b..81b12d4 100644
--- a/src/imports/localdevice/qmldir
+++ b/src/imports/localdevice/qmldir
@@ -1,3 +1,4 @@
 module QtDeviceUtilities.LocalDeviceSettings
 plugin localdeviceplugin
+classname LocalDeviceSettingsQmlPlugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp
index db90003..deaad2b 100644
--- a/src/imports/localesettings/plugin.cpp
+++ b/src/imports/localesettings/plugin.cpp
@@ -157,7 +157,7 @@ QObject *instance(QQmlEngine *engine, QJSEngine *) {
     return t;
 }
 
-class LanguageSettingsQmlPlugin : public QQmlExtensionPlugin
+class LocaleSettingsQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
diff --git a/src/imports/localesettings/qmldir b/src/imports/localesettings/qmldir
index 0110eda..0106d12 100644
--- a/src/imports/localesettings/qmldir
+++ b/src/imports/localesettings/qmldir
@@ -1,3 +1,4 @@
 module QtDeviceUtilities.LocaleSettings
 plugin localesettingsplugin
+classname LocaleSettingsQmlPlugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index 419b685..ee49594 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -169,7 +169,7 @@ QObject *instance(QQmlEngine *engine, QJSEngine *) {
     return t;
 }
 
-void NetworksettingspluginPlugin::registerTypes(const char *uri)
+void NetworkSettingsQmlPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDeviceUtilities.NetworkSettings"));
     qmlRegisterUncreatableType<QNetworkSettingsService>(uri, 1, 0, "NetworkService", "Cannot be instantiated directly.");
diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h
index e5c7bc7..0cae114 100644
--- a/src/imports/networksettings/plugin.h
+++ b/src/imports/networksettings/plugin.h
@@ -33,7 +33,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class NetworksettingspluginPlugin : public QQmlExtensionPlugin
+class NetworkSettingsQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
diff --git a/src/imports/networksettings/qmldir b/src/imports/networksettings/qmldir
index e94bfe4..64b8d6e 100644
--- a/src/imports/networksettings/qmldir
+++ b/src/imports/networksettings/qmldir
@@ -1,3 +1,4 @@
 module QtDeviceUtilities.NetworkSettings
 plugin networksettingsplugin
+classname NetworkSettingsQmlPlugin
 typeinfo plugins.qmltypes
diff --git a/src/imports/timedatesettings/qmldir b/src/imports/timedatesettings/qmldir
index 3e99f3d..3489ac2 100644
--- a/src/imports/timedatesettings/qmldir
+++ b/src/imports/timedatesettings/qmldir
@@ -1,3 +1,4 @@
 module QtDeviceUtilities.TimeDateSettings
 plugin qmltimedatesettingsplugin
+classname TimeDateSettingsQmlPlugin
 typeinfo plugins.qmltypes