diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 16:57:26 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 16:57:26 +1000 |
| commit | eb15d0e412fc1ddb3f99da4ff7d57902da3a5a6d (patch) | |
| tree | ce8a6ba34968fe0b43b33e84c6a75a7ee6032a5f | |
| parent | 0671bdf04b46715c848c8cccfff9767428d1d8db (diff) | |
| parent | 0db79fb5343452c168a0a779d671d75554fc7f7a (diff) | |
| download | qtmultimedia-eb15d0e412fc1ddb3f99da4ff7d57902da3a5a6d.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:
Don't build and install examples and demos unless requested
| -rw-r--r-- | qtmultimedia.pro | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index d9daa8499..00cd6bd50 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -6,10 +6,18 @@ module_qtmultimedia_src.target = module-qtmultimedia-src module_qtmultimedia_demos.subdir = demos module_qtmultimedia_demos.target = module-qtmultimedia-demos module_qtmultimedia_demos.depends = module_qtmultimedia_src +!contains(QT_BUILD_PARTS,demos) { + module_multimedia_demos.CONFIG += no_default_install no_default_target +} + module_qtmultimedia_examples.subdir = examples module_qtmultimedia_examples.target = module-qtmultimedia-examples module_qtmultimedia_examples.depends = module_qtmultimedia_src +!contains(QT_BUILD_PARTS,examples) { + module_multimedia_examples.CONFIG += no_default_install no_default_target +} + module_qtmultimedia_tests.subdir = tests module_qtmultimedia_tests.target = module-qtmultimedia-tests |