From b7ded4e4216987d28be92cf8309a38c6dc18961b Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Wed, 3 May 2017 18:36:28 +0200 Subject: Fix bundling of module for static builds Without this patch the module is not bundled in static builds correctly causing 'module "" 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 Reviewed-by: J-P Nurmi Reviewed-by: Oswald Buddenhagen --- src/chartsqml2/chartsqml2_plugin.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) 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")); -- cgit v1.2.3