diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 16:15:20 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-14 17:03:21 +0000 |
| commit | f0ea26416a73e9ed60e0e0440275e73081f601a2 (patch) | |
| tree | fc757ae3e14e32be4bd4bcd3629d79527308907a /qtmultimedia.pro | |
| parent | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff) | |
| download | qtmultimedia-f0ea26416a73e9ed60e0e0440275e73081f601a2.tar.gz | |
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 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 38 |
1 files changed, 0 insertions, 38 deletions
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) |