Align the Material style plugin

Specifically for static builds, use a unique name and explicit
initialization for plugin resources.

Change-Id: I2182386adfc5bbc5074f4dde6c9605b73207307b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

5 files changed, 26 insertions, 13 deletions

diff --git a/src/imports/controls/material/material.pri b/src/imports/controls/material/material.pri
index c71256da..e2c09777 100644
--- a/src/imports/controls/material/material.pri
+++ b/src/imports/controls/material/material.pri
@@ -3,7 +3,6 @@ HEADERS += \
     $$PWD/qquickmaterialprogressring_p.h
 
 SOURCES += \
-    $$PWD/qtquickmaterialstyleplugin.cpp \
     $$PWD/qquickmaterialstyle.cpp \
     $$PWD/qquickmaterialprogressring.cpp
 
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index db7490d3..02263e21 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -1,4 +1,4 @@
-TARGET  = qtquickmaterialstyleplugin
+TARGET  = qtlabsmaterialstyleplugin
 TARGETPATH = Qt/labs/controls/material
 IMPORT_VERSION = 1.0
 
@@ -10,11 +10,14 @@ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 OTHER_FILES += \
     qmldir
 
-include(material.pri)
-include(../shared/shared.pri)
+SOURCES += \
+    $$PWD/qtlabsmaterialstyleplugin.cpp
 
 RESOURCES += \
-    resources.qrc
+    $$PWD/qtlabsmaterialstyleplugin.qrc
+
+include(material.pri)
+include(../shared/shared.pri)
 
 CONFIG += no_cxx_module
 load(qml_plugin)
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index 1a2aafe2..19f71b4a 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -1,4 +1,4 @@
 module Qt.labs.controls.material
-plugin qtquickmaterialstyleplugin
-classname QtQuickMaterialStylePlugin
+plugin qtlabsmaterialstyleplugin
+classname QtLabsMaterialStylePlugin
 depends Qt.labs.controls 1.0
diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
index d50f674a..c145bab4 100644
--- a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
+++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
@@ -35,30 +35,41 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtCore/qfileselector.h>
-#include <QtCore/qurl.h>
 
 #include "qquickmaterialstyle_p.h"
 #include "qquickmaterialprogressring_p.h"
 
+void initResources()
+{
+    Q_INIT_RESOURCE(qtlabsmaterialstyleplugin);
+}
+
 QT_BEGIN_NAMESPACE
 
-class QtQuickMaterialStylePlugin : public QQmlExtensionPlugin
+class QtLabsMaterialStylePlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void initializeEngine(QQmlEngine *engine, const char *uri) Q_DECL_OVERRIDE;
 };
 
-void QtQuickMaterialStylePlugin::registerTypes(const char *uri)
+void QtLabsMaterialStylePlugin::registerTypes(const char *uri)
 {
     qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property"));
     qmlRegisterType<QQuickMaterialProgressRing>(uri, 1, 0, "ProgressRing");
     qmlRegisterType<QQuickMaterialRingAnimator>(uri, 1, 0, "RingAnimator");
 }
 
+void QtLabsMaterialStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(uri);
+    initResources();
+}
+
 QT_END_NAMESPACE
 
-#include "qtquickmaterialstyleplugin.moc"
+#include "qtlabsmaterialstyleplugin.moc"
diff --git a/src/imports/controls/material/resources.qrc b/src/imports/controls/material/qtlabsmaterialstyleplugin.qrc
index c2cb2c73..c2cb2c73 100644
--- a/src/imports/controls/material/resources.qrc
+++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.qrc