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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
From c8422d0fe53247b0c1e0f2adf6f919bb2446005f Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 2 Mar 2011 13:44:28 -0600
Subject: [PATCH] Remove moved examples/demos
---
qtbase/demos/demos.pro | 2 --
qtbase/demos/embedded/embedded.pro | 20 --------------------
qtbase/examples/desktop/desktop.pro | 2 --
qtbase/examples/draganddrop/draganddrop.pro | 2 --
qtbase/examples/examples.pro | 2 --
qtbase/examples/graphicsview/graphicsview.pro | 1 -
qtbase/examples/network/network.pro | 4 ----
qtbase/examples/opengl/opengl.pro | 5 -----
qtbase/examples/painting/painting.pro | 2 --
qtbase/examples/richtext/richtext.pro | 2 --
10 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/qtbase/demos/demos.pro b/qtbase/demos/demos.pro
index fe8b416..cbee2b2 100644
--- a/qtbase/demos/demos.pro
+++ b/qtbase/demos/demos.pro
@@ -48,8 +48,6 @@ SUBDIRS += demos_boxes
mac* && !qpa: SUBDIRS += demos_macmainwindow
wince*|symbian|embedded|x11: SUBDIRS += demos_embedded
-!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
-
!cross_compile:{
contains(QT_BUILD_PARTS, tools):{
!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
diff --git a/qtbase/demos/embedded/embedded.pro b/qtbase/demos/embedded/embedded.pro
index f67ac56..e9a448b 100644
--- a/qtbase/demos/embedded/embedded.pro
+++ b/qtbase/demos/embedded/embedded.pro
@@ -1,28 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = styledemo raycasting flickable digiflip
-contains(QT_CONFIG, svg) {
- SUBDIRS += embeddedsvgviewer \
- desktopservices
- fluidlauncher.subdir = fluidlauncher
- fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo
- !vxworks:!qnx:SUBDIRS += fluidlauncher
-}
-
SUBDIRS += lightmaps
SUBDIRS += flightinfo
-contains(QT_CONFIG, svg) {
- SUBDIRS += weatherinfo
-}
-
-contains(QT_CONFIG, webkit) {
- SUBDIRS += anomaly
-}
-
-contains(QT_CONFIG, declarative) {
- # Qml demos require DEPLOYMENT support. Therefore, only symbian.
- symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
-}
# install
sources.files = README *.pro
diff --git a/qtbase/examples/desktop/desktop.pro b/qtbase/examples/desktop/desktop.pro
index 4bf02df..58c7b97 100644
--- a/qtbase/examples/desktop/desktop.pro
+++ b/qtbase/examples/desktop/desktop.pro
@@ -2,8 +2,6 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = screenshot
-!symbian:contains(QT_CONFIG, svg): SUBDIRS += systray
-
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
diff --git a/qtbase/examples/draganddrop/draganddrop.pro b/qtbase/examples/draganddrop/draganddrop.pro
index 9cc0e2b..8f737f1 100644
--- a/qtbase/examples/draganddrop/draganddrop.pro
+++ b/qtbase/examples/draganddrop/draganddrop.pro
@@ -5,8 +5,6 @@ SUBDIRS = draggableicons \
fridgemagnets \
puzzle
-contains(QT_CONFIG, svg): SUBDIRS += delayedencoding
-
wince*: SUBDIRS -= dropsite
symbian: SUBDIRS -= dropsite
# install
diff --git a/qtbase/examples/examples.pro b/qtbase/examples/examples.pro
index ec0c1b0..8efda7b 100644
--- a/qtbase/examples/examples.pro
+++ b/qtbase/examples/examples.pro
@@ -30,8 +30,6 @@ SUBDIRS = \
gestures
}
-contains(QT_CONFIG, webkit):SUBDIRS += webkit
-
symbian: SUBDIRS = \
graphicsview \
itemviews \
diff --git a/qtbase/examples/graphicsview/graphicsview.pro b/qtbase/examples/graphicsview/graphicsview.pro
index 0abbaf9..a1458de 100644
--- a/qtbase/examples/graphicsview/graphicsview.pro
+++ b/qtbase/examples/graphicsview/graphicsview.pro
@@ -13,7 +13,6 @@ SUBDIRS = \
simpleanchorlayout \
weatheranchorlayout
-contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids
contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot
# install
diff --git a/qtbase/examples/network/network.pro b/qtbase/examples/network/network.pro
index 7f32a4a..09765a6 100644
--- a/qtbase/examples/network/network.pro
+++ b/qtbase/examples/network/network.pro
@@ -20,10 +20,6 @@ SUBDIRS = \
multicastreceiver \
multicastsender
- contains(QT_CONFIG, svg) {
- SUBDIRS += bearercloud
- }
-
# no QProcess
!vxworks:!qnx:SUBDIRS += network-chat
diff --git a/qtbase/examples/opengl/opengl.pro b/qtbase/examples/opengl/opengl.pro
index 7bb5b29..f9ca0bd 100644
--- a/qtbase/examples/opengl/opengl.pro
+++ b/qtbase/examples/opengl/opengl.pro
@@ -19,11 +19,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){
framebufferobject2 \
samplebuffers \
textures
-
- contains(QT_CONFIG, svg) {
- SUBDIRS += framebufferobject \
- pbuffers2
- }
}
# install
diff --git a/qtbase/examples/painting/painting.pro b/qtbase/examples/painting/painting.pro
index ef1f57b..4108a64 100644
--- a/qtbase/examples/painting/painting.pro
+++ b/qtbase/examples/painting/painting.pro
@@ -7,8 +7,6 @@ SUBDIRS = basicdrawing \
!wince*:!symbian: SUBDIRS += fontsampler
-contains(QT_CONFIG, svg): SUBDIRS += svggenerator svgviewer
-
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
diff --git a/qtbase/examples/richtext/richtext.pro b/qtbase/examples/richtext/richtext.pro
index 348f467..102181e 100644
--- a/qtbase/examples/richtext/richtext.pro
+++ b/qtbase/examples/richtext/richtext.pro
@@ -3,8 +3,6 @@ SUBDIRS = calendar \
orderform \
syntaxhighlighter
-contains(QT_CONFIG, svg): SUBDIRS += textobject
-
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
--
1.7.3.2.343.g7d43d
|
