diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-09 13:39:09 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 08:28:51 +0000 |
| commit | ae842623ea1aca15bab2a245d2add779aa219375 (patch) | |
| tree | 023bceafe77ca3658872349dfa584540a560223d /src/controls | |
| parent | 5ab01d7dc4b5a5d180885e3bc2a82267f9fcf3ae (diff) | |
| download | qtquickcontrols-ae842623ea1aca15bab2a245d2add779aa219375.tar.gz | |
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: Ieb67edec480eba18cdad29f39b262cfb8839bf8a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/Styles/Android/plugin.cpp | 9 | ||||
| -rw-r--r-- | src/controls/Styles/WinRT/plugin.cpp | 6 | ||||
| -rw-r--r-- | src/controls/plugin.cpp | 9 |
3 files changed, 1 insertions, 23 deletions
diff --git a/src/controls/Styles/Android/plugin.cpp b/src/controls/Styles/Android/plugin.cpp index 646fff36..7a09bb9c 100644 --- a/src/controls/Styles/Android/plugin.cpp +++ b/src/controls/Styles/Android/plugin.cpp @@ -44,13 +44,6 @@ #include "qquickandroidstyle_p.h" #include "qquickandroid9patch_p.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Android); -#endif -} - QT_BEGIN_NAMESPACE class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin @@ -59,7 +52,7 @@ class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri); }; diff --git a/src/controls/Styles/WinRT/plugin.cpp b/src/controls/Styles/WinRT/plugin.cpp index e6d0adfe..b205d75e 100644 --- a/src/controls/Styles/WinRT/plugin.cpp +++ b/src/controls/Styles/WinRT/plugin.cpp @@ -39,15 +39,9 @@ #include <QtCore/qglobal.h> -static void initResources() -{ - Q_INIT_RESOURCE(WinRT); -} - extern "C" { Q_DECL_EXPORT bool qt_quick_controls_style_init() { - initResources(); return true; } diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 4eb6c466..8aca0c49 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -71,14 +71,6 @@ #include <QtCore/qlocale.h> #endif -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtQuick_Controls); - Q_INIT_RESOURCE(qmake_controls); -#endif -} - QT_BEGIN_NAMESPACE static const struct { @@ -129,7 +121,6 @@ static const struct { QtQuickControls1Plugin::QtQuickControls1Plugin(QObject *parent) : QQmlExtensionPlugin(parent) { - initResources(); } void QtQuickControls1Plugin::registerTypes(const char *uri) |