diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-26 17:04:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-27 07:10:20 +0000 |
| commit | c0913e0b2a0e4cac7e7cc779b7ef3b78ba9d17cd (patch) | |
| tree | ee7d527026c90977500ed75fa27237d072c8c70e /src | |
| parent | acb67561a3753306a2262f7221baca2d727fd4cb (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: I9c47e29e336efac47e41a583bb1ba4368f3170fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/winextras/plugin.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index 55be331..60d2525 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -49,13 +49,6 @@ #include <QtQml/QtQml> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtWinExtras); -#endif -} - QT_BEGIN_NAMESPACE class QWinExtrasQmlPlugin : public QQmlExtensionPlugin @@ -64,7 +57,7 @@ class QWinExtrasQmlPlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QWinExtrasQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QWinExtrasQmlPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); |