diff options
author | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-02-04 08:18:32 +0100 |
---|---|---|
committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-02-04 08:14:48 +0000 |
commit | c202263af0114ade63836665d424bc2219aa3fac (patch) | |
tree | 75c907a6c0ea162eee0219d23c07161336a4dd4d | |
parent | c6a28570a7300788127117378eb7cd36dcd0953f (diff) | |
download | qtlocation-c202263af0114ade63836665d424bc2219aa3fac.tar.gz |
Enable using the module in a statically linked application
Change-Id: I2c9652f13421b21cee2cd07c65918aacc4e1a836
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r-- | src/imports/location/location.cpp | 8 | ||||
-rw-r--r-- | src/imports/positioning/positioning.cpp | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index dbeb3c5d..548c796a 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -69,6 +69,13 @@ #include <QtCore/QDebug> +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtLocation); +#endif +} + QT_BEGIN_NAMESPACE @@ -80,6 +87,7 @@ class QtLocationDeclarativeModule: public QQmlExtensionPlugin FILE "plugin.json") public: + QtLocationDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { if (QLatin1String(uri) == QLatin1String("QtLocation")) { diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 86c8ee86..8a4fef47 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -59,6 +59,13 @@ #include <QtCore/QDebug> +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtPositioning); +#endif +} + QT_BEGIN_NAMESPACE /*! @@ -503,6 +510,7 @@ class QtPositioningDeclarativeModule: public QQmlExtensionPlugin FILE "plugin.json") public: + QtPositioningDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { if (QLatin1String(uri) == QStringLiteral("QtPositioning")) { |