diff options
author | Julian Strobl <stroblju@gmail.com> | 2017-05-03 18:37:20 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-05 04:51:07 +0000 |
commit | bc89be768bce0f510e807b003d476a2355b676c1 (patch) | |
tree | dc2a2eb64d57f73fb602f97f6920ee7c7a51e940 /src | |
parent | 0340120d5f7940c9aebfd0f60328805227f8824d (diff) |
Fix bundling of module for static builds
Without this patch the module is not bundled in static builds correctly
causing 'module "<QtModule>" is not installed' errors in during runtime.
As reference: this happens, because 'QQmlMetaType::isAnyModule(importUri)'
at 'qtdeclarative/src/qml/qml/qqmltypeloader.cpp:1422:' returns 'false',
which indicates that the module was not registered.
Task-number: QTBUG-59559
Change-Id: I37003c4305fbe499c9911ff2aefa35deab832bdf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualizationqml2/datavisualizationqml2_plugin.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index eb2f965b..77b5f1cf 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -117,6 +117,13 @@ QML_DECLARE_TYPE(QCustom3DItem) QML_DECLARE_TYPE(QCustom3DLabel) QML_DECLARE_TYPE(QCustom3DVolume) +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtDataVisualization); +#endif +} + QT_BEGIN_NAMESPACE_DATAVISUALIZATION class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin @@ -125,6 +132,7 @@ class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: + QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri); }; |