diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-04-25 11:01:36 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-05-02 15:46:46 +0000 |
| commit | 87689de1bd97a94598ff7fbbf20834b81e4d1beb (patch) | |
| tree | b3836b49e077025cd1ba0b86cd5d65e2c3c69206 /src/imports/testlib | |
| parent | d258c904a6027007d00526ab38b8cc5ba2aed3bf (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: I7275029bd4c15eda6bb8c2ab7ae8c1cd3933aedb
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/imports/testlib')
| -rw-r--r-- | src/imports/testlib/main.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index 443229bee9..af15a44012 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -54,13 +54,6 @@ QML_DECLARE_TYPE(QuickTestEvent) #include <QtDebug> -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtTest); -#endif -} - QT_BEGIN_NAMESPACE class QuickTestUtil : public QObject @@ -150,7 +143,7 @@ class QTestQmlModule : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: - QTestQmlModule(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); } + QTestQmlModule(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) override { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtTest")); |