summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/location/location.cpp9
-rw-r--r--src/imports/locationlabs/locationlabs.cpp9
-rw-r--r--src/imports/positioning/positioning.cpp9
3 files changed, 3 insertions, 24 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 45b104b9..f806e013 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -73,13 +73,6 @@
#include <QtCore/QDebug>
-static void initResources()
-{
-#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_QtLocation);
-#endif
-}
-
QT_BEGIN_NAMESPACE
@@ -91,7 +84,7 @@ class QtLocationDeclarativeModule: public QQmlExtensionPlugin
FILE "plugin.json")
public:
- QtLocationDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+ QtLocationDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
virtual void registerTypes(const char *uri)
{
if (QLatin1String(uri) == QLatin1String("QtLocation")) {
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 56924b80..6f3b6dd1 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -46,13 +46,6 @@
#include <QtQml/qqml.h>
#include <QtCore/QDebug>
-static void initResources()
-{
-#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_QtLocationLabs);
-#endif
-}
-
QT_BEGIN_NAMESPACE
@@ -64,7 +57,7 @@ class QtLocationLabsDeclarativeModule: public QQmlExtensionPlugin
FILE "plugin.json")
public:
- QtLocationLabsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+ QtLocationLabsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
virtual void registerTypes(const char *uri)
{
if (QLatin1String(uri) == QLatin1String("Qt.labs.location")) {
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 6af79b54..08ce384b 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -62,13 +62,6 @@
#include <QtCore/QDebug>
-static void initResources()
-{
-#ifdef QT_STATIC
- Q_INIT_RESOURCE(qmake_QtPositioning);
-#endif
-}
-
QT_BEGIN_NAMESPACE
/*!
@@ -572,7 +565,7 @@ class QtPositioningDeclarativeModule: public QQmlExtensionPlugin
FILE "plugin.json")
public:
- QtPositioningDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+ QtPositioningDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
virtual void registerTypes(const char *uri)
{
if (QLatin1String(uri) == QStringLiteral("QtPositioning")) {