diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-23 05:01:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-23 05:01:40 (GMT) |
| commit | d1072c333225ded9e46cf857bef701cc67f6fc1d (patch) | |
| tree | d20b15a94385a78f907350a0f74b9faa905eff3d /tests/auto/auto.pro | |
| parent | 4f35294d737d9059398b2c8f714c8e0ea37079ed (diff) | |
| parent | c42f7058dfd7ea551b2d3bca5651b0c802c91259 (diff) | |
| download | Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.zip Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.tar.gz Qt-d1072c333225ded9e46cf857bef701cc67f6fc1d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
src/gui/kernel/qaction.h
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f6ff59d..4ff0080 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -395,7 +395,8 @@ SUBDIRS += _networkselftest \ symbols \ qrand \ uic \ - uic3 + uic3 \ + utf8 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter @@ -424,9 +425,14 @@ SUBDIRS += checkxmlfiles \ qxmlnodemodelindex \ qxmlquery \ qxmlresultitems \ + qxmlschema \ + qxmlschemavalidator \ qxmlserializer \ xmlpatterns \ xmlpatternsdiagnosticsts \ + xmlpatternsschema \ + xmlpatternsschemats \ + xmlpatternsvalidator \ xmlpatternsview \ xmlpatternsxqts \ xmlpatternsxslts |