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
|
From cd306f5e26c78c9c0d33366d767ab495004fc1da Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Mon, 21 Mar 2011 16:38:55 +0100
Subject: [PATCH] Removed examples and demos that are no longer in qtbase.
---
qtbase/demos/demos.pro | 3 +--
qtbase/examples/examples.pro | 7 +------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/qtbase/demos/demos.pro b/qtbase/demos/demos.pro
index cbee2b2..81968fd 100644
--- a/qtbase/demos/demos.pro
+++ b/qtbase/demos/demos.pro
@@ -50,8 +50,7 @@ wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
!cross_compile:{
contains(QT_BUILD_PARTS, tools):{
-!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
-wince*:SUBDIRS += demos_sqlbrowser
+SUBDIRS += demos_sqlbrowser
}
}
diff --git a/qtbase/examples/examples.pro b/qtbase/examples/examples.pro
index 8efda7b..0680ff4 100644
--- a/qtbase/examples/examples.pro
+++ b/qtbase/examples/examples.pro
@@ -49,12 +49,7 @@ symbian: SUBDIRS = \
}
embedded:SUBDIRS += qws
-!wince*:!symbian: {
- !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
- contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help
-} else {
- contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
-}
+contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
contains(QT_CONFIG, opengl): SUBDIRS += opengl
contains(QT_CONFIG, openvg): SUBDIRS += openvg
contains(QT_CONFIG, dbus): SUBDIRS += dbus
--
1.7.3.2.343.g7d43d
|
