diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-04 17:09:37 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 11:51:39 +0200 |
commit | 2d94b598d976374b5b67805f2c55b546582a757a (patch) | |
tree | a62d57d94d1c78cdf036b64efa8e0952470ebc5e /src | |
parent | bfccbcfc4edf65e31fe4b086013e1bf132e9b047 (diff) | |
download | qtmultimedia-2d94b598d976374b5b67805f2c55b546582a757a.tar.gz qtmultimedia-2d94b598d976374b5b67805f2c55b546582a757a.tar.bz2 qtmultimedia-2d94b598d976374b5b67805f2c55b546582a757a.zip |
make MODULE_PLUGIN_TYPES assignment actually have an effect
it must be done before load()ing qt_plugin.prf.
Change-Id: I0ad31f8d9761b2d059d656c9e4f674c8a7cc88a6
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/multimedia.pro | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 5ed0cefc..23cca253 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -1,6 +1,12 @@ TARGET = QtMultimedia QT = core-private network gui-private +MODULE_PLUGIN_TYPES = \ + mediaservice \ + audio \ + video/videonode \ + playlistformats + QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf load(qt_module) @@ -67,11 +73,6 @@ ANDROID_FEATURES += \ android.hardware.camera \ android.hardware.camera.autofocus \ android.hardware.microphone -MODULE_PLUGIN_TYPES = \ - mediaservice \ - audio \ - video/videonode \ - playlistformats win32: LIBS_PRIVATE += -luuid |