summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-10-26 16:15:20 +0200
committerYoann Lopes <yoann.lopes@qt.io>2016-11-14 17:03:21 +0000
commitf0ea26416a73e9ed60e0e0440275e73081f601a2 (patch)
treefc757ae3e14e32be4bd4bcd3629d79527308907a /examples
parentd5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff)
Move qtmultimedia over to the new config system
Use the new configuration system to define external libraries, configure tests and features. Don't use pkg-config outside of the configuration step. And move all command line options over from qtbase, so that we can remove them from there in a second step. Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/multimedia/multimedia.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro
index 449cb150f..0a01439c4 100644
--- a/examples/multimedia/multimedia.pro
+++ b/examples/multimedia/multimedia.pro
@@ -1,4 +1,5 @@
TEMPLATE = subdirs
+QT_FOR_CONFIG += multimedia-private
SUBDIRS += audiodecoder
@@ -20,5 +21,5 @@ qtHaveModule(quick) {
video
}
-config_openal: SUBDIRS += audioengine
+qtConfig(openal): SUBDIRS += audioengine