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:
	src/gsttools/qgstutils.cpp

Change-Id: Ic54ab6c6560ded0db4b98f83256d997bee828083
This commit is contained in:
Frederik Gladhorn
2015-03-03 18:18:12 +01:00
parent 33b27c3c15 f39d8b73ee
commit b348c9e7b0
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/plugins.pro
View File

@@ -6,7 +6,11 @@
TEMPLATE = subdirs
SUBDIRS += m3u videonode
SUBDIRS += m3u
qtHaveModule(quick) {
SUBDIRS += videonode
}
android {
SUBDIRS += android opensles