diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-26 17:01:23 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2018-04-27 07:56:22 +0000 |
| commit | 54dc1cebd3f78d2b2b8d8d6d486035d364405761 (patch) | |
| tree | 200681606dc9ef24617b6efdf7b1020158d8bff4 /src | |
| parent | efeb2a2895bfa2d83f5e7494149a7fa14789e1ee (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: Id7ef0308bdc029377e3e6c605feff91c1defb231
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/scxmlstatemachine/plugin.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/imports/scxmlstatemachine/plugin.cpp b/src/imports/scxmlstatemachine/plugin.cpp index f1cb413..b9f4748 100644 --- a/src/imports/scxmlstatemachine/plugin.cpp +++ b/src/imports/scxmlstatemachine/plugin.cpp @@ -46,13 +46,6 @@ #include <qqmlextensionplugin.h> #include <qqml.h> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtScxml); -#endif -} - QT_BEGIN_NAMESPACE class QScxmlStateMachinePlugin : public QQmlExtensionPlugin @@ -61,7 +54,7 @@ class QScxmlStateMachinePlugin : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QScxmlStateMachinePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QScxmlStateMachinePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) { // @uri QtScxml |