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
176
177
178
179
180
181
182
183
184
185
186
187
188
|
From 880f8a40fb25a1ff03bf6c51f3cf0c1236fe3867 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Fri, 7 Jan 2011 13:47:49 +0100
Subject: [PATCH] Make auto test build
---
phonon/tests/auto/auto.pro | 3 +++
qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro | 3 +++
.../tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp | 2 +-
.../auto/q3sqlselectcursor/q3sqlselectcursor.pro | 2 ++
.../q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 2 +-
qtkernel/tests/auto/auto.pro | 10 ----------
.../tests/auto/declarative/examples/examples.pro | 2 +-
.../qdeclarativesqldatabase.pro | 2 +-
.../qdeclarativeviewer/qdeclarativeviewer.pro | 2 +-
.../qapplicationargumentparser.pro | 2 +-
.../auto/xmlpatternsschema/xmlpatternsschema.pro | 4 +++-
.../tests/auto/xmlpatternssdk/xmlpatternssdk.pro | 7 ++++---
12 files changed, 21 insertions(+), 20 deletions(-)
create mode 100644 phonon/tests/auto/auto.pro
diff --git a/phonon/tests/auto/auto.pro b/phonon/tests/auto/auto.pro
new file mode 100644
index 0000000..ef6bdf4
--- /dev/null
+++ b/phonon/tests/auto/auto.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro
diff --git a/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro b/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro
index 2d316fb..7da4f8b 100644
--- a/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro
+++ b/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro
@@ -1,5 +1,8 @@
load(qttest_p4)
+load(qt_module)
+
SOURCES += tst_q3sqlcursor.cpp
+INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto
QT += sql qt3support
requires(contains(QT_CONFIG,qt3support))
diff --git a/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
index 6f3722d..7103fb5 100644
--- a/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
+++ b/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
@@ -46,7 +46,7 @@
#include <qsqldriver.h>
#include <QSet>
-#include "../qsqldatabase/tst_databases.h"
+#include "qsqldatabase/tst_databases.h"
const QString qtest(qTableName( "qtest", __FILE__ ));
diff --git a/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro b/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro
index 59448eb..48d5bfe 100644
--- a/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro
+++ b/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro
@@ -1,5 +1,7 @@
load(qttest_p4)
+load(qt_module)
SOURCES += tst_q3sqlselectcursor.cpp
+INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto
QT += sql qt3support
requires(contains(QT_CONFIG,qt3support))
diff --git a/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp b/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp
index a5eecde..2ac7e80 100644
--- a/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp
+++ b/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp
@@ -49,7 +49,7 @@
#define NODATABASE_SKIP "No database drivers are available in this Qt configuration"
-#include "../qsqldatabase/tst_databases.h"
+#include "qsqldatabase/tst_databases.h"
//TESTED_FILES=
diff --git a/qtkernel/tests/auto/auto.pro b/qtkernel/tests/auto/auto.pro
index c677249..02e8b5b 100644
--- a/qtkernel/tests/auto/auto.pro
+++ b/qtkernel/tests/auto/auto.pro
@@ -9,15 +9,5 @@ SUBDIRS += \
other.pro
!cross_compile: SUBDIRS += host.pro
-contains(QT_CONFIG, qt3support):!wince*: SUBDIRS += qt3support.pro
contains(QT_CONFIG, opengl): SUBDIRS += opengl.pro
-contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns.pro
unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro
-contains(QT_CONFIG, script): SUBDIRS += script.pro
-contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro
-contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro
-contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro
-contains(QT_CONFIG, svg): SUBDIRS += svg.pro
-contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro
-!symbian SUBDIRS += help.pro
-
diff --git a/qtdeclarative/tests/auto/declarative/examples/examples.pro b/qtdeclarative/tests/auto/declarative/examples/examples.pro
index dafc146..fa632f0 100644
--- a/qtdeclarative/tests/auto/declarative/examples/examples.pro
+++ b/qtdeclarative/tests/auto/declarative/examples/examples.pro
@@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle
SOURCES += tst_examples.cpp
-include(../../../../tools/qml/qml.pri)
+include(../../../../tools/qmlviewer/qml.pri)
include(../symbianlibs.pri)
diff --git a/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
index 0d335a5..bce758a 100644
--- a/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
+++ b/qtdeclarative/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro
@@ -1,6 +1,6 @@
load(qttest_p4)
contains(QT_CONFIG,declarative): QT += declarative
-QT += sql script
+QT += sql script webkit
macx:CONFIG -= app_bundle
SOURCES += tst_qdeclarativesqldatabase.cpp
diff --git a/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
index 8d4b410..46a3dae 100644
--- a/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
+++ b/qtdeclarative/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
contains(QT_CONFIG,declarative): QT += declarative gui
macx:CONFIG -= app_bundle
-include(../../../../tools/qml/qml.pri)
+include(../../../../tools/qmlviewer/qml.pri)
SOURCES += tst_qdeclarativeviewer.cpp
diff --git a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
index df32e92..80e207f 100644
--- a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
+++ b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro
@@ -3,4 +3,4 @@ SOURCES += tst_qapplicationargumentparser.cpp \
../../../tools/xmlpatterns/qapplicationargument.cpp \
../../../tools/xmlpatterns/qapplicationargumentparser.cpp
QT -= gui
-INCLUDEPATH += $$QT_SOURCE_TREE/tools/xmlpatterns/
+INCLUDEPATH += ../../../tools/xmlpatterns/
diff --git a/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
index 2ba869a..734ac26 100644
--- a/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
+++ b/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro
@@ -1,6 +1,8 @@
load(qttest_p4)
+load(qt_module)
+
SOURCES += tst_xmlpatternsschema.cpp \
include (../xmlpatterns.pri)
-INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private
+INCLUDEPATH += $$QT.xmlpatterns.private_includes
diff --git a/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index 6204f01..9ba9cb6 100644
--- a/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
+++ b/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
include (../xmlpatterns.pri)
TARGET = $$XMLPATTERNS_SDK
@@ -27,9 +29,8 @@ DESTDIR = $$QT_BUILD_TREE/lib
# syncqt doesn't copy headers in tools/ so let's manually ensure
# it works with shadow builds and source builds.
-INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \
- $$QT_SOURCE_TREE/include/QtXmlPatterns/private \
- $$QT_SOURCE_TREE/tools/xmlpatterns
+INCLUDEPATH += $$QT.xmlpatterns.private_includes \
+ ../../../tools/xmlpatterns
HEADERS = ASTItem.h \
DebugExpressionFactory.h \
--
1.7.1
|
