aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-05-13 21:51:24 +0300
committerEckhart Koppen <eckhart.koppen@nokia.com>2011-05-13 22:58:43 +0300
commit9ad13d527d0201fc834cc6898f212a6b5b686fe9 (patch)
tree9303f16c853a7fad78f02c123ca9fc9c0f68eaf0
parent30327650798ba63281c7b9344c9d824d00dce82a (diff)
Honor -nomake for examples and demos
Don't build or install demos and examples when they are disabled. Reviewed-by: TrustMe (cherry picked from commit 61c0b5c3923956db53408ad3513488f6f4893c2f)
-rw-r--r--qtdeclarative.pro6
1 files changed, 6 insertions, 0 deletions
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index c4140225c5..678fdf3398 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -10,10 +10,16 @@ module_qtdeclarative_tools.depends = module_qtdeclarative_src
module_qtdeclarative_demos.subdir = demos
module_qtdeclarative_demos.target = module-qtdeclarative-demos
module_qtdeclarative_demos.depends = module_qtdeclarative_src
+!contains(QT_BUILD_PARTS,demos) {
+ module_qtdeclarative_demos.CONFIG = no_default_target no_default_install
+}
module_qtdeclarative_examples.subdir = examples/declarative
module_qtdeclarative_examples.target = module-qtdeclarative-examples
module_qtdeclarative_examples.depends = module_qtdeclarative_src
+!contains(QT_BUILD_PARTS,examples) {
+ module_qtdeclarative_examples.CONFIG = no_default_target no_default_install
+}
module_qtdeclarative_tests.subdir = tests
module_qtdeclarative_tests.target = module-qtdeclarative-tests