Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtmultimedia-staging: tests: build autotests by default for qtmultimedia
This commit is contained in:
@@ -14,7 +14,8 @@ module_qtmultimedia_examples.depends = module_qtmultimedia_src
|
|||||||
module_qtmultimedia_tests.subdir = tests
|
module_qtmultimedia_tests.subdir = tests
|
||||||
module_qtmultimedia_tests.target = module-qtmultimedia-tests
|
module_qtmultimedia_tests.target = module-qtmultimedia-tests
|
||||||
module_qtmultimedia_tests.depends = module_qtmultimedia_src
|
module_qtmultimedia_tests.depends = module_qtmultimedia_src
|
||||||
module_qtmultimedia_tests.CONFIG = no_default_target no_default_install
|
module_qtmultimedia_tests.CONFIG = no_default_install
|
||||||
|
!contains(QT_BUILD_PARTS,tests):module_qtmultimedia_tests.CONFIG += no_default_target
|
||||||
|
|
||||||
SUBDIRS += module_qtmultimedia_src \
|
SUBDIRS += module_qtmultimedia_src \
|
||||||
module_qtmultimedia_demos \
|
module_qtmultimedia_demos \
|
||||||
|
|||||||
Reference in New Issue
Block a user