diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 15:07:11 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-24 15:07:11 +1000 |
| commit | 485f0bfd5761eff264712fcc0bd46c66470be505 (patch) | |
| tree | 24a9762a3d5c87d267fab398d5598dbd46b646fe /tests/auto/auto.pro | |
| parent | 7c76abb0dc4204043bec9b6fa315f9753a7986ae (diff) | |
| parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
| download | qt4-tools-485f0bfd5761eff264712fcc0bd46c66470be505.tar.gz | |
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.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index dd9f395b92..e625c69004 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 \ |