summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/multimedia.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-12-12 09:48:13 +0100
committerLiang Qi <liang.qi@qt.io>2016-12-12 10:27:59 +0100
commit533759ef333e4db8625cd02f763994788da01199 (patch)
treedcb4b4ec8882b42ce8213f4e309534dd8d234843 /examples/multimedia/multimedia.pro
parent31ed506ea2c7a8be439d77e02ca0d67b6f9ce675 (diff)
parent7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts: src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
Diffstat (limited to 'examples/multimedia/multimedia.pro')
-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