1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 6587d943370ffd4efca0ff40e0f637c7cfb054d9 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
---
qtbase/configure | 2 +-
qtbase/qtbase.pro | 11 +----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/qtbase/configure b/qtbase/configure
index 10f6180..68f95d1 100755
--- a/qtbase/configure
+++ b/qtbase/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/qtbase.pro b/qtbase/qtbase.pro
index 5b246ef..fd7b4b0 100644
--- a/qtbase/qtbase.pro
+++ b/qtbase/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 {
--
1.7.3.2.343.g7d43d
|
