diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-16 08:34:44 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-16 08:34:44 (GMT) |
| commit | fec52b0c12386cbd3fd7d8cb886afaef5e30a744 (patch) | |
| tree | 01fa9a01f880e04f74d067e579d165904d02b11f /tests/auto/auto.pro | |
| parent | 3dce31e5eb0fac43d445fb9664f1b68f4cd4c11f (diff) | |
| parent | ea83669b9b44b1fb3a5acae6d53afd1df401e9b5 (diff) | |
| download | Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.zip Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.tar.gz Qt-fec52b0c12386cbd3fd7d8cb886afaef5e30a744.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index fd634c4..ea05cc6 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -141,10 +141,18 @@ SUBDIRS += _networkselftest \ qglobal \ qgraphicsitem \ qgraphicsitemanimation \ + qgraphicslayout \ + qgraphicslayoutitem \ + qgraphicslinearlayout \ + qgraphicsobject \ + qgraphicspixmapitem \ + qgraphicspolygonitem \ + qgraphicsproxywidget \ qgraphicsscene \ qgraphicssceneindex \ qgraphicsview \ - qgridlayout \ + qgraphicswidget \ + qgridlayout \ qgroupbox \ qguivariant \ qhash \ @@ -439,6 +447,8 @@ unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebframe \ - qwebpage + qwebpage \ + qwebhistoryinterface \ + qwebelement SUBDIRS += math3d |