diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-20 15:02:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 08:14:02 +0000 |
| commit | 5df2972e560dab4a1778444dc1dbe0c95c86be21 (patch) | |
| tree | 8f4e0fa3410d11c0dcf4a329fa8520905cde36dd /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | bafe2ca913f6268829088326b86ec90b41277c36 (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: Ic3fa0827ee6719b0a22f73b48667deb129089a6f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index d0018901..bff8110d 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -60,14 +60,6 @@ #include "qquickdefaultstyle_p.h" #include "qquickdefaulttheme_p.h" -static inline void initResources() -{ - Q_INIT_RESOURCE(qtquickcontrols2plugin); -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtQuick_Controls_2); -#endif -} - QT_BEGIN_NAMESPACE class QtQuickControls2Plugin: public QQuickStylePlugin @@ -87,7 +79,6 @@ public: QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlugin(parent) { - initResources(); } QtQuickControls2Plugin::~QtQuickControls2Plugin() |