diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 12:36:50 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 12:36:50 +1000 |
| commit | 45bf6160616206fcb9dea4e3836fab359f07361e (patch) | |
| tree | c4ba6d18c81cbaa547c306a7b4137bf87ac99bf3 | |
| parent | 306424c55f9df61b686754591006b9e7e54a13d4 (diff) | |
| parent | a612c40d2ea880e0c439a608f3be1e91564c5b98 (diff) | |
| download | qtmultimedia-45bf6160616206fcb9dea4e3836fab359f07361e.tar.gz | |
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
| -rw-r--r-- | qtmultimedia.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index bbaaa7af8..d9daa8499 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -14,7 +14,8 @@ module_qtmultimedia_examples.depends = module_qtmultimedia_src module_qtmultimedia_tests.subdir = tests module_qtmultimedia_tests.target = module-qtmultimedia-tests 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 \ module_qtmultimedia_demos \ |