summaryrefslogtreecommitdiffstats
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-02-24 05:07:11 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-02-24 05:07:11 (GMT)
commit485f0bfd5761eff264712fcc0bd46c66470be505 (patch)
tree24a9762a3d5c87d267fab398d5598dbd46b646fe /tests/auto/auto.pro
parent7c76abb0dc4204043bec9b6fa315f9753a7986ae (diff)
parent4d615766184e3eeee25ffc634847bec1edd47ac0 (diff)
downloadQt-485f0bfd5761eff264712fcc0bd46c66470be505.zip
Qt-485f0bfd5761eff264712fcc0bd46c66470be505.tar.gz
Qt-485f0bfd5761eff264712fcc0bd46c66470be505.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt
Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r--tests/auto/auto.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index dd9f395..e625c69 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -456,7 +456,10 @@ SUBDIRS += \
qmargins \
qnetworkaddressentry \
qnetworkcachemetadata \
+ qnetworkconfigmanager \
+ qnetworkconfiguration \
qnetworkdiskcache \
+ qnetworksession \
qobjectperformance \
qpainterpathstroker \
qplugin \