slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4' into 5.5

Browse Source 
Conflicts:
	qtmultimedia.pro
	src/gsttools/qgstreamervideowidget.cpp
	src/plugins/gstreamer/camerabin/camerabinservice.cpp

Change-Id: I883f20dc17924ab42514a1aa00d16675a0f13d99
This commit is contained in:
Frederik Gladhorn
2015-02-24 17:38:46 +01:00
parent f86a3b7bb3 fcf5d826a0
commit 39bb642cb2
8 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qtmultimedia.pro
View File

@@ -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) {