summaryrefslogtreecommitdiffstats
path: root/patches/qt-everywhere-opensource-src-4.7.3/0004-add-missing-subdirs.patch
blob: f82cdeffe3c1938b38e4ce4b6d23dbcd69873926 (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
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/tutorials/tutorials.pro               |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro
index b811e44..7748da0 100644
--- a/examples/declarative/modelviews/modelviews.pro
+++ b/examples/declarative/modelviews/modelviews.pro
@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
+    abstractitemmodel \
     objectlistmodel \
     stringlistmodel
 
diff --git a/examples/examples.pro b/examples/examples.pro
index ead2214..fe681ed 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -70,7 +70,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative
 win32: 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/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
index 34723c2..4728dac 100644
--- a/examples/tutorials/tutorials.pro
+++ b/examples/tutorials/tutorials.pro
@@ -1,5 +1,6 @@
 TEMPLATE      = subdirs
 SUBDIRS       = \
+                widgets \
                 addressbook \
                 modelview