summaryrefslogtreecommitdiff
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-21 15:23:42 +0200
committeraxis <qt-info@nokia.com>2009-08-21 15:23:42 +0200
commit044680951401487590c0ed554092dd9b7e0ee783 (patch)
treeed2492ad2fd49481148fdd7a1486cbf197c9bfe7 /tests/auto/auto.pro
parentab1df6dea670a60bfef5efd81d6687f9534cfc5d (diff)
parent00ba962d428dcdff70fcde74a9e5cb316545cef6 (diff)
downloadqt4-tools-044680951401487590c0ed554092dd9b7e0ee783.tar.gz
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: src/corelib/io/qprocess.h
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r--tests/auto/auto.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 772b562549..073bb10c95 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -301,7 +301,10 @@ SUBDIRS += \
qstatusbar \
qstl \
qstring \
- qstringbuilder \
+ qstringbuilder1 \
+ qstringbuilder2 \
+ qstringbuilder3 \
+ qstringbuilder4 \
qstringmatcher \
qstringlist \
qstringlistmodel \