From f0ea26416a73e9ed60e0e0440275e73081f601a2 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Wed, 26 Oct 2016 16:15:20 +0200
Subject: 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>
---
 src/plugins/plugins.pro | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/plugins/plugins.pro')

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index f113f68b3..b0c5101b6 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -5,6 +5,7 @@
 ######################################################################
 
 TEMPLATE = subdirs
+QT_FOR_CONFIG += multimedia-private
 
 SUBDIRS += m3u
 
@@ -17,7 +18,7 @@ android {
 }
 
 qnx {
-    config_mmrenderer: SUBDIRS += qnx
+    qtConfig(mmrenderer): SUBDIRS += qnx
     SUBDIRS += audiocapture
 }
 
@@ -26,44 +27,44 @@ qnx:!blackberry {
 }
 
 win32 {
-    config_wasapi: SUBDIRS += wasapi
+    qtConfig(wasapi): SUBDIRS += wasapi
 }
 
 win32:!winrt {
     SUBDIRS += audiocapture \
                windowsaudio
 
-    config_directshow: SUBDIRS += directshow
-    config_wmf: SUBDIRS += wmf
+    qtConfig(directshow): SUBDIRS += directshow
+    qtConfig(wmf-backend): SUBDIRS += wmf
 }
 
+
 winrt {
     SUBDIRS += winrt
 }
 
 unix:!mac:!android {
-    config_gstreamer {
+    qtConfig(gstreamer) {
        SUBDIRS += gstreamer
     } else {
         SUBDIRS += audiocapture
     }
 
-    config_pulseaudio: SUBDIRS += pulseaudio
-    config_alsa: SUBDIRS += alsa
+    qtConfig(pulseaudio): SUBDIRS += pulseaudio
+    qtConfig(alsa): SUBDIRS += alsa
 
     # v4l is turned off because it is not supported in Qt 5
-    # config_linux_v4l {
+    # qtConfig(linux_v4l) {
     #     !maemo*:SUBDIRS += v4l
     # }
 }
 
 darwin:!watchos {
     SUBDIRS += audiocapture coreaudio
-
-    config_avfoundation: SUBDIRS += avfoundation
+    qtConfig(avfoundation): SUBDIRS += avfoundation
 }
 
-config_resourcepolicy {
+qtConfig(resourcepolicy) {
     SUBDIRS += resourcepolicy
 }
 
-- 
cgit v1.2.3