diff options
| author | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-01-08 14:48:33 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@theqtcompany.com> | 2016-01-11 09:34:34 +0000 |
| commit | b323f7803abb3dff5ffd92dd6d9f228cb9a55c40 (patch) | |
| tree | fef59e78bbf8f0b0ed6436ae74b587a4a8f4bc72 /src/imports | |
| parent | 170a217b3e2fb1688ae876ca60b1beab0331b123 (diff) | |
Enable using the module in a statically built application
Change-Id: Iafdb4359f051fcd20178f3c5f42f2cff2bf8c359
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/audioengine/audioengine.cpp | 8 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 8 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 5 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/imports/audioengine/audioengine.cpp b/src/imports/audioengine/audioengine.cpp index aa2d195c5..6dc0b83e7 100644 --- a/src/imports/audioengine/audioengine.cpp +++ b/src/imports/audioengine/audioengine.cpp @@ -45,6 +45,13 @@ #include "qdeclarative_audiosample_p.h" #include "qdeclarative_attenuationmodel_p.h" +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtAudioEngine); +#endif +} + QT_BEGIN_NAMESPACE class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin @@ -53,6 +60,7 @@ class QAudioEngineDeclarativeModule : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QAudioEngineDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtAudioEngine")); diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 7d34672a1..a143d34fa 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -57,6 +57,13 @@ QML_DECLARE_TYPE(QSoundEffect) +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtMultimedia); +#endif +} + QT_BEGIN_NAMESPACE static QObject *multimedia_global_object(QQmlEngine *qmlEngine, QJSEngine *jsEngine) @@ -71,6 +78,7 @@ class QMultimediaDeclarativeModule : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: + QMultimediaDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")); diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 606fb3966..dabb0a4ba 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -1,3 +1,8 @@ +CXX_MODULE = multimedia +TARGET = declarative_multimedia +TARGETPATH = QtMultimedia +IMPORT_VERSION = 5.6 + QT += qml quick network multimedia-private qtmultimediaquicktools-private HEADERS += \ |