From d383f9f8bc3a3310683502df4f2cf0c0c18060f4 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Fri, 25 Feb 2011 19:14:08 +0000
Subject: [PATCH] Build examples and demos in qtbase

---
 configure  |  2 +-
 qtbase.pro | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index 5888b1bcaf..60e1ec1216 100755
--- a/configure
+++ b/configure
@@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto
 CFG_QWS_FREETYPE=auto
 CFG_LIBFREETYPE=auto
 CFG_SQL_AVAILABLE=
-QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations"
+QT_DEFAULT_BUILD_PARTS="libs examples demos"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
diff --git a/qtbase.pro b/qtbase.pro
index 5b246ef703..fd7b4b0273 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -7,23 +7,14 @@ TEMPLATE = subdirs
 
 cross_compile: CONFIG += nostrip
 
-QT_BUILD_PARTS = libs qmake
-
 #process the projects
 for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) {
-    isEqual(PROJECT, tools) {
-       SUBDIRS += tools
-    } else:isEqual(PROJECT, examples) {
+    isEqual(PROJECT, examples) {
        SUBDIRS += examples
     } else:isEqual(PROJECT, demos) {
        SUBDIRS += demos
     } else:isEqual(PROJECT, libs) {
        include(src/src.pro)
-    } else:isEqual(PROJECT, docs) {
-       contains(QT_BUILD_PARTS, tools):include(doc/doc.pri)
-    } else:isEqual(PROJECT, translations) {
-       !contains(QT_BUILD_PARTS, tools):!wince*:SUBDIRS += tools/linguist/lrelease
-       SUBDIRS += translations
     } else:isEqual(PROJECT, qmake) {
 #      SUBDIRS += qmake
     } else {