Enable using the module in a statically built application

Task-number: QTBUG-35754
Task-number: QTBUG-45868
Change-Id: I9bb332bc85713a17f02f3e7e768592e3234edfe3
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

5 files changed, 30 insertions, 7 deletions

diff --git a/src/extras/Private/private.pri b/src/extras/Private/private.pri
index 0e4f7a12..f0c31caa 100644
--- a/src/extras/Private/private.pri
+++ b/src/extras/Private/private.pri
@@ -12,7 +12,7 @@ SOURCES += \
     $$PWD/qquickmousethief.cpp \
     $$PWD/qquickmathutils.cpp
 
-OTHER_FILES += \
+QML_FILES += \
     $$PWD/qmldir \
     $$PWD/CircularButton.qml \
     $$PWD/CircularButtonStyleHelper.qml \
diff --git a/src/extras/Styles/Flat/Flat.pro b/src/extras/Styles/Flat/Flat.pro
index 6f70c7a8..079c3cf5 100644
--- a/src/extras/Styles/Flat/Flat.pro
+++ b/src/extras/Styles/Flat/Flat.pro
@@ -61,7 +61,8 @@ FLAT_STYLE += \
     $$PWD/fonts/OpenSans-Semibold.ttf \
     $$PWD/fonts/LICENSE.txt \
 
-RESOURCES += flatstyle.qrc
+!static:RESOURCES += flatstyle.qrc
+else: QML_FILES += $$FLAT_STYLE
 
 CONFIG += no_cxx_module
 load(qml_plugin)
diff --git a/src/extras/Styles/Flat/flatstyleplugin.cpp b/src/extras/Styles/Flat/flatstyleplugin.cpp
index d9a30d34..5d88134b 100644
--- a/src/extras/Styles/Flat/flatstyleplugin.cpp
+++ b/src/extras/Styles/Flat/flatstyleplugin.cpp
@@ -47,9 +47,14 @@
 
 static void initResources()
 {
+#ifndef QT_STATIC
     Q_INIT_RESOURCE(flatstyle);
+#else
+    Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Flat);
+#endif
 }
 
+#ifndef QT_STATIC
 extern "C" {
     Q_DECL_EXPORT bool qt_quick_controls_style_init()
     {
@@ -62,19 +67,23 @@ extern "C" {
         return ":/ExtrasImports/QtQuick/Controls/Styles/Flat";
     }
 }
+#endif
 
 QT_BEGIN_NAMESPACE
 
 QtQuickExtrasStylesPlugin::QtQuickExtrasStylesPlugin(QObject *parent) :
     QQmlExtensionPlugin(parent)
 {
+    initResources();
 }
 
 void QtQuickExtrasStylesPlugin::registerTypes(const char *uri)
 {
-    initResources();
-
-    const QString prefix = "qrc:/ExtrasImports/QtQuick/Controls/Styles/Flat/";
+#ifndef QT_STATIC
+    const QString prefix = "qrc:///ExtrasImports/QtQuick/Controls/Styles/Flat/";
+#else
+    const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Controls/Styles/Flat/";
+#endif
     // register version 1.0
     qmlRegisterSingletonType(QUrl(prefix + "FlatStyle.qml"), uri, 1, 0, "FlatStyle");
     qmlRegisterType(QUrl(prefix + "ApplicationWindowStyle.qml"), uri, 1, 0, "ApplicationWindowStyle");
diff --git a/src/extras/extras.pro b/src/extras/extras.pro
index 4363ce00..ab2f69cd 100644
--- a/src/extras/extras.pro
+++ b/src/extras/extras.pro
@@ -30,7 +30,8 @@ include(designer/designer.pri)
 
 OTHER_FILES += doc/src/*
 
-RESOURCES += extras.qrc
+!static:RESOURCES += extras.qrc
+else: QML_FILES += $$CONTROLS_QML_FILES
 
 TR_EXCLUDE += designer/*
 
diff --git a/src/extras/plugin.cpp b/src/extras/plugin.cpp
index bcbec453..960102ab 100644
--- a/src/extras/plugin.cpp
+++ b/src/extras/plugin.cpp
@@ -50,7 +50,11 @@
 
 static void initResources()
 {
+#ifndef QT_STATIC
     Q_INIT_RESOURCE(extras);
+#else
+    Q_INIT_RESOURCE(qmake_QtQuick_Extras);
+#endif
 }
 
 QT_BEGIN_NAMESPACE
@@ -65,12 +69,16 @@ static QObject *registerMathUtilsSingleton(QQmlEngine *engine, QJSEngine *jsEngi
 QtQuickExtrasPlugin::QtQuickExtrasPlugin(QObject *parent) :
     QQmlExtensionPlugin(parent)
 {
+    initResources();
 }
 
 void QtQuickExtrasPlugin::registerTypes(const char *uri)
 {
-    initResources();
+#ifndef QT_STATIC
     const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras";
+#else
+    const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras";
+#endif
     // Register public API.
     qmlRegisterUncreatableType<QQuickActivationMode>(uri, 1, 0, "ActivationMode", QLatin1String("Do not create objects of type ActivationMode"));
     // register 1.0
@@ -102,7 +110,11 @@ void QtQuickExtrasPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
     qmlRegisterType<QQuickFlatProgressBar>("QtQuick.Extras.Private.CppUtils", 1, 1, "FlatProgressBar");
     qmlRegisterSingletonType<QQuickMathUtils>("QtQuick.Extras.Private.CppUtils", 1, 0, "MathUtils", registerMathUtilsSingleton);
 
+#ifndef QT_STATIC
     const QString prefix = "qrc:///ExtrasImports/QtQuick/Extras";
+#else
+    const QString prefix = "qrc:/qt-project.org/imports/QtQuick/Extras";
+#endif
     const char *private_uri = "QtQuick.Extras.Private";
     qmlRegisterType(QUrl(prefix + "/Private/CircularButton.qml"), private_uri, 1, 0, "CircularButton");
     qmlRegisterType(QUrl(prefix + "/Private/CircularButtonStyleHelper.qml"), private_uri, 1, 0, "CircularButtonStyleHelper");