diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-01 09:25:57 (GMT) |
| commit | 574fdf0b7e61c1c9994739035d9adb51af2629d0 (patch) | |
| tree | 6cf91585a63b26dce56f18a1ccd924cf7ec38cb9 /tests/auto/auto.pro | |
| parent | a1d5b33bd33ecf1d809346a39d2386cafaf50cef (diff) | |
| parent | 9cb231d773db6deb8fb145eb40aa949a2758d002 (diff) | |
| download | Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.zip Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.gz Qt-574fdf0b7e61c1c9994739035d9adb51af2629d0.tar.bz2 | |
Merge commit 'qt/master' into graphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/graphicsview/qgraphicsview.cpp
src/gui/graphicsview/qgraphicsview_p.h
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ea05cc6..6143534 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -10,6 +10,7 @@ SUBDIRS += _networkselftest \ compile \ compilerwarnings \ exceptionsafety \ + linguist \ macgui \ macplist \ mediaobject \ @@ -217,6 +218,7 @@ SUBDIRS += _networkselftest \ qnetworkproxy \ qnetworkrequest \ qnetworkreply \ + qnetworkaccessmanager_and_qprogressdialog \ qnumeric \ qobject \ qobjectrace \ @@ -449,6 +451,7 @@ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebframe \ qwebpage \ qwebhistoryinterface \ - qwebelement + qwebelement \ + qwebhistory SUBDIRS += math3d |