2 files changed, 10 insertions, 1 deletions
diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml
index 4e73321e..56d7a983 100644
--- a/src/imports/controls/universal/ComboBox.qml
+++ b/src/imports/controls/universal/ComboBox.qml
@@ -36,6 +36,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.2
+import Qt.labs.controls 1.0
 import Qt.labs.templates 1.0 as T
 import Qt.labs.controls.universal 1.0
 
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
index 703da011..605c06e5 100644
--- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
@@ -48,6 +48,9 @@
 static inline void initResources()
 {
     Q_INIT_RESOURCE(qtlabsuniversalstyleplugin);
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_Qt_labs_controls_universal);
+#endif
 }
 
 QT_BEGIN_NAMESPACE
@@ -58,6 +61,7 @@ class QtLabsUniversalStylePlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
+    QtLabsUniversalStylePlugin(QObject *parent = Q_NULLPTR);
     ~QtLabsUniversalStylePlugin();
     void registerTypes(const char *uri) Q_DECL_OVERRIDE;
     void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE;
@@ -66,6 +70,11 @@ private:
     QQuickProxyTheme *theme;
 };
 
+QtLabsUniversalStylePlugin::QtLabsUniversalStylePlugin(QObject *parent) : QQmlExtensionPlugin(parent)
+{
+    initResources();
+}
+
 QtLabsUniversalStylePlugin::~QtLabsUniversalStylePlugin()
 {
     if (theme) {
@@ -93,7 +102,6 @@ void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char
         }
     }
 
-    initResources();
     engine->addImageProvider(QStringLiteral("universal"), new QQuickUniversalImageProvider);
 
     QByteArray import = QByteArray(uri) + ".impl";