From 08de2bbd637de1ddfc5806d2dafabc56f0764661 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 26 Apr 2018 16:56:55 +0200 Subject: Remove the code to manually initialize resources in static builds After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I1ad043f9e676deaea30ae022c090f188066a299c Reviewed-by: Miikka Heikkinen --- src/datavisualizationqml2/datavisualizationqml2_plugin.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.h b/src/datavisualizationqml2/datavisualizationqml2_plugin.h index 77b5f1cf..5bc19b4d 100644 --- a/src/datavisualizationqml2/datavisualizationqml2_plugin.h +++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.h @@ -117,13 +117,6 @@ 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 @@ -132,7 +125,7 @@ class QtDataVisualizationQml2Plugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtDataVisualizationQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri); }; -- cgit v1.2.3