summaryrefslogtreecommitdiffstats
path: root/patches/qt-everywhere-opensource-src-4.8.7/0004-add-missing-subdirs.patch
blob: cf6024ee85d255dceaed76d42c25ce30032f69b9 (plain)
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
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Fri, 8 Oct 2010 20:13:40 +0200
Subject: [PATCH] add missing subdirs

SUBDIRS is not set correctly in several places in examples
This patch fixes it.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 examples/declarative/modelviews/modelviews.pro | 1 +
 examples/examples.pro                          | 2 +-
 examples/itemviews/itemviews.pro               | 4 +++-
 examples/tutorials/tutorials.pro               | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro
index 00e07fec030e..7f7d673346f9 100644
--- a/examples/declarative/modelviews/modelviews.pro
+++ b/examples/declarative/modelviews/modelviews.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
+    abstractitemmodel \
     objectlistmodel \
     stringlistmodel \
     abstractitemmodel \
diff --git a/examples/examples.pro b/examples/examples.pro
index 67b4cf826a7c..e67030a17357 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -72,7 +72,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative helper
 win32:!win32-g++*: SUBDIRS += activeqt
 contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns
 contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
-contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
+!contains(DEFINES, QT_NO_CONCURRENT): SUBDIRS += qtconcurrent
 
 # install
 sources.files = README *.pro
diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro
index 137599ca6553..547694d9f50a 100644
--- a/examples/itemviews/itemviews.pro
+++ b/examples/itemviews/itemviews.pro
@@ -2,6 +2,7 @@ TEMPLATE      = subdirs
 SUBDIRS       = addressbook \
                 basicsortfiltermodel \
                 chart \
+                coloreditorfactory \
                 combowidgetmapper \
                 customsortfiltermodel \
                 dirview \
@@ -13,7 +14,8 @@ SUBDIRS       = addressbook \
                 simpledommodel \
                 simpletreemodel \
                 simplewidgetmapper \
-                spinboxdelegate
+                spinboxdelegate \
+                stardelegate
 
 # install
 sources.files = README *.pro
diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
index ba1769deb459..cb1ca6ea382b 100644
--- a/examples/tutorials/tutorials.pro
+++ b/examples/tutorials/tutorials.pro
@@ -1,5 +1,6 @@
 TEMPLATE      = subdirs
 SUBDIRS       = \
+                widgets \
                 addressbook \
                 modelview \
                 threads