add multimediawidgets before gsttools to SUBDIRS
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:
committed by
Qt by Nokia
parent
786ecd937c
commit
9219ba76fd
14
src/src.pro
14
src/src.pro
@@ -23,13 +23,6 @@ SUBDIRS += \
|
||||
src_imports
|
||||
|
||||
# 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) {
|
||||
SUBDIRS += src_qtmmwidgets
|
||||
|
||||
@@ -40,5 +33,12 @@ contains(config_test_gstreamer, yes) {
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user