diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-20 15:36:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-07 07:36:07 +0000 |
| commit | 1a4f25133fae09492e001cc680f4bf3b866f8743 (patch) | |
| tree | 75a52b4080cf9d417d5a414a3852334cc97469ff /src | |
| parent | 2d62591b6e0679974a90ff534aee34c36a1b3e2d (diff) | |
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: Ic7c794c6cf4490e056835cc47f1c7f9237ad1850
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/chartsqml2/chartsqml2_plugin.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp index b1a9d412..7c5f7902 100644 --- a/src/chartsqml2/chartsqml2_plugin.cpp +++ b/src/chartsqml2/chartsqml2_plugin.cpp @@ -139,13 +139,6 @@ 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 @@ -155,7 +148,7 @@ class QtChartsQml2Plugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts")); |