Commit a0f1964e authored by Simon Hausmann's avatar Simon Hausmann
Browse files

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: I09efba67c3d2e9b68b73707101f1b8cc22284131
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@qt.io>
Showing with 1 addition and 8 deletions
......@@ -42,13 +42,6 @@
#include <QQmlExtensionPlugin>
static void initResources()
{
#ifdef QT_STATIC
Q_INIT_RESOURCE(qmake_QtWebSockets);
#endif
}
QT_BEGIN_NAMESPACE
class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin
......@@ -57,7 +50,7 @@ class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin
Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
public:
QtWebSocketsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
QtWebSocketsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
void registerTypes(const char *uri);
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment