summaryrefslogtreecommitdiffstats
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-08-21 07:06:09 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-08-21 07:06:09 (GMT)
commitc7e2ad82ea4cd999e568e2819dea10bf7214eee3 (patch)
tree41ec4c2e65dae6284f42f7676ba32fe46594ea8d /tests/auto/auto.pro
parentf11fc8f62558543dac1eca9d52a4801196c55221 (diff)
parent926f5ad207fb04fdeb09c0b696dce3c072e47e75 (diff)
downloadQt-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/auto.pro')
-rw-r--r--tests/auto/auto.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 411e7eb..e9e1c8a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -137,6 +137,7 @@ SUBDIRS += \
qgraphicsgridlayout \
qgraphicsitem \
qgraphicsitemanimation \
+ qgraphicsanchorlayout \
qgraphicslayout \
qgraphicslayoutitem \
qgraphicslinearlayout \