summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/declarative.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-22 01:15:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-22 01:15:09 (GMT)
commitdbd293e2579e80756ca7e711ea1f82b9e42c5b92 (patch)
tree06f75805eda1da32e03026dd005801f0ece36356 /tests/auto/declarative/declarative.pro
parent9dbba618af3b505c0aac590d0b0ec32eabb76d76 (diff)
parent91ebcc413f0650ab235b93689776d4457bdbc80e (diff)
downloadQt-dbd293e2579e80756ca7e711ea1f82b9e42c5b92.zip
Qt-dbd293e2579e80756ca7e711ea1f82b9e42c5b92.tar.gz
Qt-dbd293e2579e80756ca7e711ea1f82b9e42c5b92.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed inconsistent test naming. Add a selftest to enforce correct test naming conventions. Make maketestselftest more strict.
Diffstat (limited to 'tests/auto/declarative/declarative.pro')
-rw-r--r--tests/auto/declarative/declarative.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 36eade8..eb74244 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -1,7 +1,6 @@
TEMPLATE = subdirs
SUBDIRS += \
graphicswidgets \ # Cover
- layouts \ # Cover
parserstress \ # Cover
qmetaobjectbuilder \ # Cover
qdeclarativeanimations \ # Cover
@@ -29,6 +28,7 @@ SUBDIRS += \
qdeclarativeitem \ # Cover
qdeclarativelistview \ # Cover
qdeclarativeloader \ # Cover
+ qdeclarativelayouts \ # Cover
qdeclarativemousearea \ # Cover
qdeclarativeparticles \ # Cover
qdeclarativepathview \ # Cover