diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:37:40 +0200 |
| commit | 53fcf914e278ed4395a4873af2b64272c5d7882c (patch) | |
| tree | 6394dc7e3dffe2f8a93b0bf48610016c7917e905 /src/datavisualizationqml2/datavisualizationqml2_plugin.h | |
| parent | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (diff) | |
| parent | 9546547495582628ba815a7d99e621d11ca84fa1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I363b4779fe630b7956f6582ac3821d4ea8ee34c8
Diffstat (limited to 'src/datavisualizationqml2/datavisualizationqml2_plugin.h')
| -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); }; |