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

add multimediawidgets before gsttools to SUBDIRS

Browse Source 
the build dependency does not override the qmake processing order, but
this will become important soon.

Change-Id: I8ef88285f9c12829080e6f5e1cc0349dd59f83b8
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
This commit is contained in:
Oswald Buddenhagen
2012-05-22 18:04:58 +02:00
committed by Qt by Nokia
parent 786ecd937c
commit 9219ba76fd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/src.pro
View File

@@ -23,13 +23,6 @@ SUBDIRS += \
src_imports src_imports
# Optional bits # Optional bits
contains(config_test_gstreamer, yes) {
SUBDIRS += src_qgsttools
# If gstreamer is present, then plugins should depend on it
src_plugins.depends += src_qgsttools
}
!isEmpty(QT.widgets.name) { !isEmpty(QT.widgets.name) {
SUBDIRS += src_qtmmwidgets SUBDIRS += src_qtmmwidgets
@@ -40,5 +33,12 @@ contains(config_test_gstreamer, yes) {
src_qgsttools.depends += src_qtmmwidgets src_qgsttools.depends += src_qtmmwidgets
} }
contains(config_test_gstreamer, yes) {
SUBDIRS += src_qgsttools
# If gstreamer is present, then plugins should depend on it
src_plugins.depends += src_qgsttools
}
SUBDIRS += src_plugins SUBDIRS += src_plugins