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>

29 files changed, 268 insertions, 185 deletions

diff --git a/src/bluetoothsettings/bluetoothsettings.pro b/src/bluetoothsettings/bluetoothsettings.pro
index cb98ccb..7f46c58 100644
--- a/src/bluetoothsettings/bluetoothsettings.pro
+++ b/src/bluetoothsettings/bluetoothsettings.pro
@@ -2,7 +2,6 @@ load(qt_build_config)
 
 TARGET = QtBluetoothSettings
 VERSION = 1.0
-CONFIG += dll warn_on
 
 QT += core bluetooth
 
diff --git a/src/displaysettings/displaysettings.pro b/src/displaysettings/displaysettings.pro
index c03168d..f19d872 100644
--- a/src/displaysettings/displaysettings.pro
+++ b/src/displaysettings/displaysettings.pro
@@ -2,7 +2,6 @@ load(qt_build_config)
 
 TARGET = QtDisplaySettings
 VERSION = 1.0
-CONFIG += dll warn_on
 
 QT = core
 
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
diff --git a/src/localdevice/localdevice.pro b/src/localdevice/localdevice.pro
index e6e5bc9..9adc183 100644
--- a/src/localdevice/localdevice.pro
+++ b/src/localdevice/localdevice.pro
@@ -2,7 +2,6 @@ load(qt_build_config)
 
 TARGET = QtLocalDevice
 VERSION = 1.0
-CONFIG += dll warn_on
 
 QT = core
 
diff --git a/src/localesettings/localesettings.pro b/src/localesettings/localesettings.pro
index 808477d..7f5f98a 100644
--- a/src/localesettings/localesettings.pro
+++ b/src/localesettings/localesettings.pro
@@ -2,7 +2,6 @@ load(qt_build_config)
 
 TARGET = QtLocaleSettings
 VERSION = 1.0
-CONFIG += dll warn_on
 
 QT = core dbus
 
diff --git a/src/networksettings/networksettings.pro b/src/networksettings/networksettings.pro
index db2ce06..1704f4e 100644
--- a/src/networksettings/networksettings.pro
+++ b/src/networksettings/networksettings.pro
@@ -2,7 +2,6 @@ load(qt_build_config)
 
 TARGET = QtNetworkSettings
 VERSION = 1.0
-CONFIG += dll warn_on
 
 QT = core network
 
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h b/src/settingsui/qtbuttonimageproviderplugin/plugin.cpp
index 32a92b5..7245feb 100644
--- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h
+++ b/src/settingsui/qtbuttonimageproviderplugin/plugin.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Device Utilities module of the Qt Toolkit.
@@ -26,22 +26,44 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef SETTINGSUIPLUGIN_PLUGIN_H
-#define SETTINGSUIPLUGIN_PLUGIN_H
-
 #include <QQmlExtensionPlugin>
+#include <QQmlEngine>
+
+#include "qtbuttonimageprovider.h"
+
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtDeviceUtilities_QtButtonImageProvider);
+#endif
+    Q_INIT_RESOURCE(qtbuttonimageprovider);
+}
 
 QT_BEGIN_NAMESPACE
 
-class SettingsuipluginPlugin : public QQmlExtensionPlugin
+class QtButtonImageProviderQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    void registerTypes(const char *uri);
+    QtButtonImageProviderQmlPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
+
+    void registerTypes(const char *uri)
+    {
+        Q_UNUSED(uri)
+        Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.QtButtonImageProvider"));
+        qmlRegisterType(QUrl("qrc:/QtButton.qml"), uri, 1, 0, "QtButton");
+    }
+
+    void initializeEngine(QQmlEngine *engine, const char *uri)
+    {
+        Q_UNUSED(uri);
+        QtButtonImageProvider *provider = new QtButtonImageProvider();
+        engine->addImageProvider("QtButton", provider);
+    }
 };
 
 QT_END_NAMESPACE
 
-#endif // SETTINGSUIPLUGIN_PLUGIN_H
+#include "plugin.moc"
diff --git a/src/settingsui/qtbuttonimageproviderplugin/qmldir b/src/settingsui/qtbuttonimageproviderplugin/qmldir
index 5567d74..4107ed2 100644
--- a/src/settingsui/qtbuttonimageproviderplugin/qmldir
+++ b/src/settingsui/qtbuttonimageproviderplugin/qmldir
@@ -1,2 +1,3 @@
 module QtDeviceUtilities.QtButtonImageProvider
 plugin qtbuttonimageproviderplugin
+classname QtButtonImageProviderQmlPlugin
diff --git a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.cpp b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.cpp
index 3879d9b..a3649bb 100644
--- a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.cpp
+++ b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.cpp
@@ -26,102 +26,75 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QQmlExtensionPlugin>
-#include <QQmlEngine>
 #include <QQuickImageProvider>
 #include <QImage>
 #include <QPainter>
 
-class QtButtonImageProvider : public QQuickImageProvider
-{
-public:
-    QtButtonImageProvider()
-        : QQuickImageProvider(QQuickImageProvider::Pixmap)
-    {
-    }
-
-    QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
-    {
-        bool ok = false;
-
-        QStringList params = id.split("/");
-
-        int cutSize = params.at(0).toInt(&ok);
-
-        if (!ok)
-            cutSize = 10;
-
-        QColor fillColor;
-        QColor borderColor;
-
-        if (params.length() > 1) {
-            fillColor = QColor(params.at(1));
-        }
-
-        if (params.length() > 2)
-            borderColor = QColor(params.at(2));
+#include "qtbuttonimageprovider.h"
 
-        if (!fillColor.isValid())
-            fillColor = "#00eb00";
-
-        if (!borderColor.isValid())
-            borderColor ="white";
-
-        int width = 100;
-        int height = 50;
-
-        if (size)
-            *size = QSize(requestedSize.width(), requestedSize.height());
+QtButtonImageProvider::QtButtonImageProvider()
+        : QQuickImageProvider(QQuickImageProvider::Pixmap)
+{
+}
 
-        QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width,
-                       requestedSize.height() > 0 ? requestedSize.height() : height);
-        pixmap.fill(Qt::transparent);
+QPixmap QtButtonImageProvider::requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
+{
+    bool ok = false;
 
-        QPainter painter(&pixmap);
-        const qreal borderPenWidth = 2;
-        QPen borderPen(QBrush(borderColor), borderPenWidth);
-        borderPen.setJoinStyle(Qt::MiterJoin);
-        painter.setRenderHint(QPainter::Antialiasing, true);
-        painter.setPen(borderPen);
-        painter.setBrush(fillColor);
+    QStringList params = id.split("/");
 
-        QPainterPath path;
-        qreal top = borderPenWidth - 1;
-        qreal left = borderPenWidth - 1;
-        qreal bottom = pixmap.height() - borderPenWidth;
-        qreal right = pixmap.width() - borderPenWidth;
-        path.moveTo(left + cutSize, top);
-        path.lineTo(right, top);
-        path.lineTo(right, bottom - cutSize);
-        path.lineTo(right - cutSize, bottom);
-        path.lineTo(left, bottom);
-        path.lineTo(left, top + cutSize);
-        path.lineTo(left + cutSize, top);
-        painter.drawPath(path);
+    int cutSize = params.at(0).toInt(&ok);
 
-        return pixmap;
-    }
-};
+    if (!ok)
+        cutSize = 10;
 
-class ImageProviderExtensionPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
-
-public:
-    void registerTypes(const char *uri)
-    {
-        Q_UNUSED(uri)
-        Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.QtButtonImageProvider"));
-        qmlRegisterType(QUrl("qrc:/QtButton.qml"), uri, 1, 0, "QtButton");
-    }
+    QColor fillColor;
+    QColor borderColor;
 
-    void initializeEngine(QQmlEngine *engine, const char *uri)
-    {
-        Q_UNUSED(uri);
-        QtButtonImageProvider *provider = new QtButtonImageProvider();
-        engine->addImageProvider("QtButton", provider);
+    if (params.length() > 1) {
+        fillColor = QColor(params.at(1));
     }
-};
 
-#include "qtbuttonimageprovider.moc"
+    if (params.length() > 2)
+        borderColor = QColor(params.at(2));
+
+    if (!fillColor.isValid())
+        fillColor = "#00eb00";
+
+    if (!borderColor.isValid())
+        borderColor ="white";
+
+    int width = 100;
+    int height = 50;
+
+    if (size)
+        *size = QSize(requestedSize.width(), requestedSize.height());
+
+    QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width,
+                   requestedSize.height() > 0 ? requestedSize.height() : height);
+    pixmap.fill(Qt::transparent);
+
+    QPainter painter(&pixmap);
+    const qreal borderPenWidth = 2;
+    QPen borderPen(QBrush(borderColor), borderPenWidth);
+    borderPen.setJoinStyle(Qt::MiterJoin);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(borderPen);
+    painter.setBrush(fillColor);
+
+    QPainterPath path;
+    qreal top = borderPenWidth - 1;
+    qreal left = borderPenWidth - 1;
+    qreal bottom = pixmap.height() - borderPenWidth;
+    qreal right = pixmap.width() - borderPenWidth;
+    path.moveTo(left + cutSize, top);
+    path.lineTo(right, top);
+    path.lineTo(right, bottom - cutSize);
+    path.lineTo(right - cutSize, bottom);
+    path.lineTo(left, bottom);
+    path.lineTo(left, top + cutSize);
+    path.lineTo(left + cutSize, top);
+    painter.drawPath(path);
+
+    return pixmap;
+}
diff --git a/src/settingsui/qtbuttonimageproviderplugin/plugin.qrc b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.qrc
index b3b680c..b3b680c 100644
--- a/src/settingsui/qtbuttonimageproviderplugin/plugin.qrc
+++ b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageprovider.qrc
diff --git a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro
index 8383a75..2cba61b 100644
--- a/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro
+++ b/src/settingsui/qtbuttonimageproviderplugin/qtbuttonimageproviderplugin.pro
@@ -5,12 +5,13 @@ TARGET = qtbuttonimageproviderplugin
 TARGETPATH = QtDeviceUtilities/QtButtonImageProvider
 
 SOURCES += \
-    qtbuttonimageprovider.cpp
+    qtbuttonimageprovider.cpp \
+    plugin.cpp
 
 HEADERS += \
     qtbuttonimageprovider.h
 
 RESOURCES += \
-    plugin.qrc
+    qtbuttonimageprovider.qrc
 
 load(qml_plugin)
diff --git a/src/settingsui/settingsui.pro b/src/settingsui/settingsui.pro
index 51b6dca..b20b548 100644
--- a/src/settingsui/settingsui.pro
+++ b/src/settingsui/settingsui.pro
@@ -11,3 +11,8 @@ QML_IMPORT_PATH =
 
 # Default rules for deployment.
 include(deployment.pri)
+
+static {
+    QTPLUGIN += qtvirtualkeyboardplugin
+    QT += svg
+}
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/plugin.cpp
index b985e31..504e4ed 100644
--- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp
+++ b/src/settingsui/settingsuiplugin/plugin.cpp
@@ -26,8 +26,16 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "settingsuiplugin_plugin.h"
-#include <qqml.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
+
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtDeviceUtilities_SettingsUI);
+#endif
+    Q_INIT_RESOURCE(settingsui);
+}
 
 /*!
     \qmlmodule QtDeviceUtilities.SettingsUI 1.0
@@ -74,11 +82,22 @@
 
 QT_BEGIN_NAMESPACE
 
-void SettingsuipluginPlugin::registerTypes(const char *uri)
+class SettingsUIQmlPlugin : public QQmlExtensionPlugin
 {
-    // @uri QtDeviceUtilities.SettingsUI
-    Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI"));
-    qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI");
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    SettingsUIQmlPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
+    void registerTypes(const char *uri) override
+    {
+        // @uri QtDeviceUtilities.SettingsUI
+        Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI"));
+        qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI");
+    }
+
+};
 
 QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/settingsui/settingsuiplugin/plugin.qrc b/src/settingsui/settingsuiplugin/plugin.qrc
deleted file mode 100644
index e6d02ea..0000000
--- a/src/settingsui/settingsuiplugin/plugin.qrc
+++ /dev/null
@@ -1,40 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>pluginMain.qml</file>
-        <file>../bluetooth/Bluetooth.qml</file>
-        <file>../bluetooth/Discovery.qml</file>
-        <file>../common/CustomTableView.qml</file>
-        <file>../common/HandwritingModeButton.qml</file>
-        <file>../display/Display.qml</file>
-        <file>../locale/Language.qml</file>
-        <file>../locale/RegionSelect.qml</file>
-        <file>../network/AddressListEntry.qml</file>
-        <file>../network/ComboBoxEntry.qml</file>
-        <file>../network/EditWiredSettings.qml</file>
-        <file>../network/IpAddressTextField.qml</file>
-        <file>../network/NetworkDetails.qml</file>
-        <file>../network/NetworkSettings.qml</file>
-        <file>../network/WifiSelectorDelegate.qml</file>
-        <file>../network/WifiSettings.qml</file>
-        <file>../network/WifiSignalMonitor.qml</file>
-        <file>../network/WiredSettings.qml</file>
-        <file>../timedate/AnalogClock.qml</file>
-        <file>../timedate/ClockHand.qml</file>
-        <file>../timedate/CustomCalendar.qml</file>
-        <file>../timedate/TimeDate.qml</file>
-        <file>../timedate/TimezonesView.qml</file>
-        <file>settingsview.xml</file>
-        <file>../power/Power.qml</file>
-        <file>../timedate/ManualTime.qml</file>
-        <file>../timedate/CustomComboBox.qml</file>
-        <file>../common/CustomSwitch.qml</file>
-        <file>../network/NetworkListView.qml</file>
-        <file>../network/PassphraseEnter.qml</file>
-        <file>../locale/TableKey.qml</file>
-        <file>../locale/TableValue.qml</file>
-        <file>SettingsHeader.qml</file>
-        <file>SettingsDelegate.qml</file>
-        <file>SettingsTitleItem.qml</file>
-        <file>ShutdownPopup.qml</file>
-    </qresource>
-</RCC>
diff --git a/src/settingsui/settingsuiplugin/plugins.qmltypes b/src/settingsui/settingsuiplugin/plugins.qmltypes
new file mode 100644
index 0000000..a3bdbd9
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/plugins.qmltypes
@@ -0,0 +1,32 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtDeviceUtilities.SettingsUI 1.0'
+
+Module {
+    dependencies: ["QtQuick 2.8"]
+    Component {
+        prototype: "QQuickRectangle"
+        name: "QtDeviceUtilities.SettingsUI/SettingsUI 1.0"
+        exports: ["QtDeviceUtilities.SettingsUI/SettingsUI 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "__initialized"; type: "bool" }
+        Property { name: "service"; type: "QVariant" }
+        Property { name: "margin"; type: "int" }
+        Property { name: "spacing"; type: "int" }
+        Property { name: "titleFontSize"; type: "int" }
+        Property { name: "subTitleFontSize"; type: "int" }
+        Property { name: "valueFontSize"; type: "int" }
+        Property { name: "fieldHeight"; type: "int" }
+        Property { name: "fieldTextHeight"; type: "int" }
+        Property { name: "buttonHeight"; type: "int" }
+        Property { name: "model"; type: "QUrl" }
+        Signal { name: "closed" }
+        Method { name: "init"; type: "QVariant" }
+    }
+}
diff --git a/src/settingsui/settingsuiplugin/qmldir b/src/settingsui/settingsuiplugin/qmldir
index 542b7fe..88d0e45 100644
--- a/src/settingsui/settingsuiplugin/qmldir
+++ b/src/settingsui/settingsuiplugin/qmldir
@@ -1,2 +1,4 @@
 module QtDeviceUtilities.SettingsUI
 plugin settingsuiplugin
+classname SettingsUIQmlPlugin
+typeinfo plugins.qmltypes
diff --git a/src/settingsui/settingsuiplugin/settingsui.qrc b/src/settingsui/settingsuiplugin/settingsui.qrc
new file mode 100644
index 0000000..ad2a9b6
--- /dev/null
+++ b/src/settingsui/settingsuiplugin/settingsui.qrc
@@ -0,0 +1,92 @@
+<RCC>
+    <qresource prefix="/">
+        <file>pluginMain.qml</file>
+        <file>../bluetooth/Bluetooth.qml</file>
+        <file>../bluetooth/Discovery.qml</file>
+        <file>../common/CustomTableView.qml</file>
+        <file>../common/HandwritingModeButton.qml</file>
+        <file>../display/Display.qml</file>
+        <file>../locale/Language.qml</file>
+        <file>../locale/RegionSelect.qml</file>
+        <file>../network/AddressListEntry.qml</file>
+        <file>../network/ComboBoxEntry.qml</file>
+        <file>../network/EditWiredSettings.qml</file>
+        <file>../network/IpAddressTextField.qml</file>
+        <file>../network/NetworkDetails.qml</file>
+        <file>../network/NetworkSettings.qml</file>
+        <file>../network/WifiSelectorDelegate.qml</file>
+        <file>../network/WifiSettings.qml</file>
+        <file>../network/WifiSignalMonitor.qml</file>
+        <file>../network/WiredSettings.qml</file>
+        <file>../timedate/AnalogClock.qml</file>
+        <file>../timedate/ClockHand.qml</file>
+        <file>../timedate/CustomCalendar.qml</file>
+        <file>../timedate/TimeDate.qml</file>
+        <file>../timedate/TimezonesView.qml</file>
+        <file>settingsview.xml</file>
+        <file>../power/Power.qml</file>
+        <file>../timedate/ManualTime.qml</file>
+        <file>../timedate/CustomComboBox.qml</file>
+        <file>../common/CustomSwitch.qml</file>
+        <file>../network/NetworkListView.qml</file>
+        <file>../network/PassphraseEnter.qml</file>
+        <file>../locale/TableKey.qml</file>
+        <file>../locale/TableValue.qml</file>
+        <file>SettingsHeader.qml</file>
+        <file>SettingsDelegate.qml</file>
+        <file>SettingsTitleItem.qml</file>
+        <file>ShutdownPopup.qml</file>
+        <file>icons/Alert_yellow_1x.png</file>
+        <file>icons/Audio_qt_6x.png</file>
+        <file>icons/Bluetooth_qt_1x.png</file>
+        <file>icons/Bluetooth_qt_6x.png</file>
+        <file>icons/Camcorder_qt_1x.png</file>
+        <file>icons/Camera_qt_1x.png</file>
+        <file>icons/Clock_qt_1x.png</file>
+        <file>icons/Clock_qt_6x.png</file>
+        <file>icons/Display_qt_6x.png</file>
+        <file>icons/Flag_qt_6x.png</file>
+        <file>icons/FloatingButton_Active.png</file>
+        <file>icons/FloatingButton_Available.png</file>
+        <file>icons/FloatingButton_Unavailable.png</file>
+        <file>icons/Headphones_qt_1x.png</file>
+        <file>icons/Heartbeat_qt_1x.png</file>
+        <file>icons/Keyboard_qt_1x.png</file>
+        <file>icons/Laptop_qt_1x.png</file>
+        <file>icons/Microphone_qt_1x.png</file>
+        <file>icons/MobilePhone_qt_1x.png</file>
+        <file>icons/Mouse_qt_1x.png</file>
+        <file>icons/Tablet_qt_1x.png</file>
+        <file>icons/Volume_down_qt_1x.png</file>
+        <file>icons/Volume_mute_qt_1x.png</file>
+        <file>icons/Volume_up_qt_1x.png</file>
+        <file>icons/WifiAnim_black_2x.png</file>
+        <file>icons/Wifi_lightgray_2x.png</file>
+        <file>icons/World_qt_6x.png</file>
+        <file>icons/Chevron-left_black_6x.png</file>
+        <file>icons/Chevron-left_black.png</file>
+        <file>icons/Power_black_6x.png</file>
+        <file>newIcons/back_icon.svg</file>
+        <file>newIcons/bluetooth_icon.svg</file>
+        <file>newIcons/close_icon.svg</file>
+        <file>newIcons/date-time_icon.svg</file>
+        <file>newIcons/detail_icon.svg</file>
+        <file>newIcons/display_icon.svg</file>
+        <file>newIcons/grid_icon.svg</file>
+        <file>newIcons/header_toggle_icon.svg</file>
+        <file>newIcons/info_icon.svg</file>
+        <file>newIcons/language_icon.svg</file>
+        <file>newIcons/mouse_icon.svg</file>
+        <file>newIcons/mute_icon.svg</file>
+        <file>newIcons/network_icon.svg</file>
+        <file>newIcons/pause_icon.svg</file>
+        <file>newIcons/play_icon.svg</file>
+        <file>newIcons/power_icon.svg</file>
+        <file>newIcons/settings_icon.svg</file>
+        <file>newIcons/settingsmenu_launcher_icon.svg</file>
+        <file>newIcons/stop_icon.svg</file>
+        <file>newIcons/touch_icon.svg</file>
+        <file>newIcons/volume_icon.svg</file>
+        <file>newIcons/qt_logo_green_rgb.svg</file>
+    </qresource>
+</RCC>
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin.pro b/src/settingsui/settingsuiplugin/settingsuiplugin.pro
index 4e2b67d..6b8a3af 100644
--- a/src/settingsui/settingsuiplugin/settingsuiplugin.pro
+++ b/src/settingsui/settingsuiplugin/settingsuiplugin.pro
@@ -1,36 +1,16 @@
-TEMPLATE = lib
-TARGET = settingsuiplugin
 QT += qml quick
-CONFIG += plugin c++11
+CONFIG += no_cxx_module
 
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = QtDeviceUtilities.SettingsUI
+TARGET = settingsuiplugin
+TARGETPATH = QtDeviceUtilities/SettingsUI
 
-# Input
 SOURCES += \
-    settingsuiplugin_plugin.cpp
-
-HEADERS += \
-    settingsuiplugin_plugin.h
+    plugin.cpp
 
 DISTFILES += \
     qmldir
 
-!equals(_PRO_FILE_PWD_, $$OUT_PWD) {
-    copy_qmldir.target = $$OUT_PWD/qmldir
-    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
-    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
-    QMAKE_EXTRA_TARGETS += copy_qmldir
-    PRE_TARGETDEPS += $$copy_qmldir.target
-}
-
-qmldir.files = qmldir
-
-installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
-qmldir.path = $$installPath
-target.path = $$installPath
-INSTALLS += target qmldir
-
 RESOURCES += \
-    icons.qrc \
-    plugin.qrc
+    settingsui.qrc
+
+load(qml_plugin)
diff --git a/src/timedatesettings/timedatesettings.pro b/src/timedatesettings/timedatesettings.pro
index 6f3f4e9..6c35777 100644
--- a/src/timedatesettings/timedatesettings.pro
+++ b/src/timedatesettings/timedatesettings.pro
@@ -2,7 +2,6 @@ load(qt_build_config)
 
 TARGET = QtTimeDateSettings
 VERSION = 1.0
-CONFIG += dll warn_on
 
 QT = core dbus