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>
---
 qtmultimedia.pro | 38 --------------------------------------
 1 file changed, 38 deletions(-)

(limited to 'qtmultimedia.pro')

diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index c0a90bc56..00c82cd0f 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -1,41 +1,3 @@
 requires(qtHaveModule(gui))
-
-load(configure)
-qtCompileTest(openal)
-win32 {
-    qtCompileTest(directshow) {
-        qtCompileTest(wshellitem)
-    }
-    qtCompileTest(evr)
-    qtCompileTest(wmsdk)
-    qtCompileTest(wmf)
-    qtCompileTest(wasapi)
-} else:mac {
-    qtCompileTest(avfoundation)
-} else:qnx {
-    qtCompileTest(mmrenderer)
-} else:!android {
-    contains(QT_CONFIG, alsa):qtCompileTest(alsa)
-    contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
-
-    isEmpty(GST_VERSION) {
-        contains(QT_CONFIG, gstreamer-0.10) {
-            GST_VERSION = 0.10
-        } else: contains(QT_CONFIG, gstreamer-1.0) {
-            GST_VERSION = 1.0
-        }
-    }
-    cache(GST_VERSION, set)
-    !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
-        qtCompileTest(gstreamer_photography)
-        qtCompileTest(gstreamer_encodingprofiles)
-        qtCompileTest(gstreamer_appsrc)
-        qtCompileTest(linux_v4l)
-    }
-
-    qtCompileTest(resourcepolicy)
-    contains(QT_CONFIG, opengles2):qtCompileTest(gpu_vivante)
-}
-
 load(qt_parts)
 
-- 
cgit v1.2.3