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
This commit is contained in:
@@ -6,10 +6,18 @@ module_qtmultimedia_src.target = module-qtmultimedia-src
|
|||||||
module_qtmultimedia_demos.subdir = demos
|
module_qtmultimedia_demos.subdir = demos
|
||||||
module_qtmultimedia_demos.target = module-qtmultimedia-demos
|
module_qtmultimedia_demos.target = module-qtmultimedia-demos
|
||||||
module_qtmultimedia_demos.depends = module_qtmultimedia_src
|
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.subdir = examples
|
||||||
module_qtmultimedia_examples.target = module-qtmultimedia-examples
|
module_qtmultimedia_examples.target = module-qtmultimedia-examples
|
||||||
module_qtmultimedia_examples.depends = module_qtmultimedia_src
|
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.subdir = tests
|
||||||
module_qtmultimedia_tests.target = module-qtmultimedia-tests
|
module_qtmultimedia_tests.target = module-qtmultimedia-tests
|
||||||
|
|||||||
Reference in New Issue
Block a user