diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:38:46 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:38:46 +0100 |
| commit | 39bb642cb297dcd95273ba0dba417beec03e686c (patch) | |
| tree | ae8a58b76224e1ba6a83c00cfdbbb095756213ad /qtmultimedia.pro | |
| parent | f86a3b7bb3a601da9705ef178fda9658cdbfebb0 (diff) | |
| parent | fcf5d826a0e2d3ea6a01bf4c962e0d4fe096d321 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qtmultimedia.pro
src/gsttools/qgstreamervideowidget.cpp
src/plugins/gstreamer/camerabin/camerabinservice.cpp
Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99
Diffstat (limited to 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 489589df7..21d72d096 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -15,8 +15,8 @@ win32 { } else:qnx { qtCompileTest(mmrenderer) } else { - qtCompileTest(alsa) - qtCompileTest(pulseaudio) + contains(QT_CONFIG, alsa):qtCompileTest(alsa) + contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) isEmpty(GST_VERSION) { contains(QT_CONFIG, gstreamer-0.10) { |