summaryrefslogtreecommitdiffstats
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-02-23 01:36:05 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-02-23 01:36:05 (GMT)
commit27f35a9cb588ad1dd595fafedc27e5a216bebf48 (patch)
tree26aeebf20b725a340ad58b3411257fed7b626423 /tests/auto/auto.pro
parentd7c472e23b678b2898d34a37166e61402818e271 (diff)
parent14447cbbf7ee93e03286112b5b27d20961fd9551 (diff)
downloadQt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.zip
Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.tar.gz
Qt-27f35a9cb588ad1dd595fafedc27e5a216bebf48.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r--tests/auto/auto.pro12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a2c682b..7ba6243 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -460,17 +460,16 @@ SUBDIRS += \
qplugin \
qpluginloader \
qscrollbar \
- qsharedmemory \
qsidebar \
qsizegrip \
qsqldriver \
- qsystemsemaphore \
qtconcurrentfilter \
qtconcurrentiteratekernel \
qtconcurrentmap \
qtconcurrentrun \
qtconcurrentthreadengine \
qthreadpool \
+ qtipc \
qtokenautomaton \
qtouchevent \
qwidget_window \
@@ -534,15 +533,16 @@ SUBDIRS += checkxmlfiles \
xmlpatternsdiagnosticsts \
xmlpatternsschema \
xmlpatternsschemats \
+ xmlpatternssdk \
xmlpatternsvalidator \
xmlpatternsview \
xmlpatternsxqts \
xmlpatternsxslts
-xmlpatternsdiagnosticsts.depends = xmlpatternsxqts
-xmlpatternsview.depends = xmlpatternsxqts
-xmlpatternsxslts.depends = xmlpatternsxqts
-xmlpatternsschemats.depends = xmlpatternsxqts
+xmlpatternsdiagnosticsts.depends = xmlpatternssdk
+xmlpatternsview.depends = xmlpatternssdk
+xmlpatternsxslts.depends = xmlpatternssdk
+xmlpatternsschemats.depends = xmlpatternssdk
}
unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \