From 5376906de58e1c25c77b7a61800365b6e542542f Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 3 Jul 2012 21:37:01 +0200
Subject: [PATCH] use centralized handling of QT_BUILD_PARTS
Change-Id: I14f08527a0b3a1bd58f815d28ebb4f38094d3bb7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
qtdeclarative.pro | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 2d3d6c7492..a9a54cddb8 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -1,28 +1,3 @@
-TEMPLATE = subdirs
-
-module_qtdeclarative_src.subdir = src
-module_qtdeclarative_src.target = module-qtdeclarative-src
-
-module_qtdeclarative_tools.subdir = tools
-module_qtdeclarative_tools.target = module-qtdeclarative-tools
-module_qtdeclarative_tools.depends = module_qtdeclarative_src
-
-module_qtdeclarative_examples.subdir = examples
-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
-module_qtdeclarative_tests.depends = module_qtdeclarative_src
-module_qtdeclarative_tests.CONFIG = no_default_install
-!contains(QT_BUILD_PARTS,tests):module_qtdeclarative_tests.CONFIG += no_default_target
-
-SUBDIRS += module_qtdeclarative_src \
- module_qtdeclarative_tools \
- module_qtdeclarative_examples \
- module_qtdeclarative_tests \
+load(qt_parts)
include(doc/config/qtdeclarative_doc.pri)
--
GitLab