diff options
author | Julian Strobl <stroblju@gmail.com> | 2017-05-03 18:36:28 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-05 04:51:19 +0000 |
commit | b7ded4e4216987d28be92cf8309a38c6dc18961b (patch) | |
tree | 88a6c7b752172b7680b780ebd9b36293b013a2aa | |
parent | 25e51976c3324630525346ccb785fafe48ea5ed9 (diff) |
Fix bundling of module for static buildsv5.9.0-beta4
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: I6ca9c13b7467fae069d0ec3406a0e16fbb8f59d3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r-- | src/chartsqml2/chartsqml2_plugin.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index 028248f3..cc95948b 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -139,6 +139,13 @@ QML_DECLARE_TYPE(QScatterSeries) QML_DECLARE_TYPE(QSplineSeries) QML_DECLARE_TYPE(QStackedBarSeries) +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtCharts); +#endif +} + QT_CHARTS_BEGIN_NAMESPACE class QtChartsQml2Plugin : public QQmlExtensionPlugin @@ -148,6 +155,7 @@ class QtChartsQml2Plugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: + QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts")); |