diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-06 01:01:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-06 01:01:16 (GMT) |
| commit | 385799a8269dfb5b48de9e84e52af780fb400272 (patch) | |
| tree | babe8936cdd06f5b50be8b9bb671504be309b4c8 /tests/auto | |
| parent | 4b0c60c6246fb7aacea3d74787a9e5a0cc507edd (diff) | |
| parent | 1eb430a1f1ddb3d88ec44294606b365e119b2e01 (diff) | |
| download | Qt-385799a8269dfb5b48de9e84e52af780fb400272.zip Qt-385799a8269dfb5b48de9e84e52af780fb400272.tar.gz Qt-385799a8269dfb5b48de9e84e52af780fb400272.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/declarative.pro | 1 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 9b3b3d0..b8e33cf 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -29,7 +29,6 @@ SUBDIRS += \ qdeclarativeitem \ # Cover qdeclarativelistview \ # Cover qdeclarativeloader \ # Cover - qdeclarativelayouts \ # Cover qdeclarativemousearea \ # Cover qdeclarativeparticles \ # Cover qdeclarativepathview \ # Cover diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 058fda1..4f10a98 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -87,6 +87,7 @@ tst_examples::tst_examples() excludedDirs << "examples/declarative/gestures"; excludedDirs << "examples/declarative/imageprovider"; + excludedDirs << "examples/declarative/layouts/graphicsLayouts"; excludedDirs << "demos/declarative/minehunt"; excludedDirs << "doc/src/snippets/declarative/graphicswidgets"; |