summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-03-29 09:29:13 +0200
committeraxis <qt-info@nokia.com>2011-03-29 09:29:13 +0200
commit3ec7d13f9a555b673c53f9ed367fc314455eadbf (patch)
tree568ad1c4debc02fca7dbed0a560d44172360fced
parentcbfd549f84c509aba98d963b9ad1dabf421f8503 (diff)
Fixed trailing backslash problems in autotest profiles.
-rw-r--r--patches/0105-Add-tst_headersclean-for-each-module.patch36
1 files changed, 22 insertions, 14 deletions
diff --git a/patches/0105-Add-tst_headersclean-for-each-module.patch b/patches/0105-Add-tst_headersclean-for-each-module.patch
index 0570f1e..f0d2be2 100644
--- a/patches/0105-Add-tst_headersclean-for-each-module.patch
+++ b/patches/0105-Add-tst_headersclean-for-each-module.patch
@@ -162,12 +162,13 @@ copy to phonon/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/phonon/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qt3support/tests/auto/auto.pro b/qt3support/tests/auto/auto.pro
index 83fe8e3..b576bb4 100644
--- a/qt3support/tests/auto/auto.pro
@@ -265,12 +266,13 @@ copy to qt3support/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qt3support/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qtkernel/tests/auto/headersclean/headersclean.pro b/qtkernel/tests/auto/headersclean/headersclean.pro
new file mode 100644
index 0000000..d9b6ae3
@@ -478,21 +480,22 @@ copy to qtmultimedia/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qtmultimedia/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qtquick/tests/auto/auto.pro b/qtquick/tests/auto/auto.pro
index f2173f0..e2eae5e 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qtquick/tests/auto/auto.pro
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,5 @@
TEMPLATE=subdirs
SUBDIRS=\
declarative \
--
+
+!cross_compile: SUBDIRS += host.pro
diff --git a/qtquick/tests/auto/headersclean/headersclean.pro b/qtquick/tests/auto/headersclean/headersclean.pro
new file mode 100644
@@ -580,12 +583,13 @@ copy to qtquick/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qtquick/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qtscript/tests/auto/auto.pro b/qtscript/tests/auto/auto.pro
index c4d0544..2cfdcfd 100644
--- a/qtscript/tests/auto/auto.pro
@@ -684,21 +688,22 @@ copy to qtscript/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qtscript/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qtsvg/tests/auto/auto.pro b/qtsvg/tests/auto/auto.pro
index cb3cccb..8d5ccde 100644
--- a/qtsvg/tests/auto/auto.pro
+++ b/qtsvg/tests/auto/auto.pro
-@@ -3,4 +3,4 @@ SUBDIRS=\
+@@ -3,4 +3,5 @@ SUBDIRS=\
qsvgdevice \
qsvggenerator \
qsvgrenderer \
--
+
+!cross_compile: SUBDIRS += host.pro
diff --git a/qtsvg/tests/auto/headersclean/headersclean.pro b/qtsvg/tests/auto/headersclean/headersclean.pro
new file mode 100644
@@ -786,12 +791,13 @@ copy to qtsvg/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qtsvg/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qttools/tests/auto/auto.pro b/qttools/tests/auto/auto.pro
index c1e3bd1..49c179f 100644
--- a/qttools/tests/auto/auto.pro
@@ -887,21 +893,22 @@ copy to qttools/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qttools/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
diff --git a/qtxmlpatterns/tests/auto/auto.pro b/qtxmlpatterns/tests/auto/auto.pro
index b9244d6..9d977a9 100644
--- a/qtxmlpatterns/tests/auto/auto.pro
+++ b/qtxmlpatterns/tests/auto/auto.pro
-@@ -46,4 +46,4 @@ xmlpatternsxqts.depends = xmlpatternssdk
+@@ -46,4 +46,5 @@ xmlpatternsxqts.depends = xmlpatternssdk
xmlpatternssdk \
xmlpatternsxqts \
xmlpatternsxslts \
--
+
+!cross_compile: SUBDIRS += host.pro
diff --git a/qtxmlpatterns/tests/auto/headersclean/headersclean.pro b/qtxmlpatterns/tests/auto/headersclean/headersclean.pro
new file mode 100644
@@ -989,12 +996,13 @@ copy to qtxmlpatterns/tests/auto/host.pro
index f2173f0..5156cd1 100644
--- a/qtquick/tests/auto/auto.pro
+++ b/qtxmlpatterns/tests/auto/host.pro
-@@ -1,4 +1,3 @@
+@@ -1,4 +1,4 @@
TEMPLATE=subdirs
SUBDIRS=\
- declarative \
-
+ headersclean \
++
--
1.7.3.2.343.g7d43d