diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-08-21 07:06:09 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-08-21 07:06:09 (GMT) |
| commit | c7e2ad82ea4cd999e568e2819dea10bf7214eee3 (patch) | |
| tree | 41ec4c2e65dae6284f42f7676ba32fe46594ea8d /tests/auto/tests.xml | |
| parent | f11fc8f62558543dac1eca9d52a4801196c55221 (diff) | |
| parent | 926f5ad207fb04fdeb09c0b696dce3c072e47e75 (diff) | |
| download | Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.zip Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.tar.gz Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.tar.bz2 | |
Merge branch 'anchorlayout' of git@gitorious.org:+openbossa-developers/qt/openbossa-clone
Conflicts:
src/gui/graphicsview/graphicsview.pri
Diffstat (limited to 'tests/auto/tests.xml')
| -rw-r--r-- | tests/auto/tests.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml index ccfc380..f197de0 100644 --- a/tests/auto/tests.xml +++ b/tests/auto/tests.xml @@ -128,6 +128,7 @@ <Test name="qgraphicslayout" location="tests/auto/qgraphicslayout/tst_qgraphicslayout" /> <Test name="qgraphicslayoutitem" location="tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem" /> <Test name="qgraphicslinearlayout" location="tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout" /> + <Test name="qgraphicsanchorlayout" location="tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout" /> <Test name="qgraphicspixmapitem" location="tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem" /> <Test name="qgraphicspolygonitem" location="tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem" /> <Test name="qgraphicsproxywidget" location="tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget" /> @@ -538,6 +539,7 @@ <Test id="qgraphicslayout" /> <Test id="qgraphicslayoutitem" /> <Test id="qgraphicslinearlayout" /> + <Test id="qgraphicsanchorlayout" /> <Test id="qgraphicspixmapitem" /> <Test id="qgraphicspolygonitem" /> <Test id="qgraphicsproxywidget" /> |