summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2011-07-15 15:49:49 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-15 08:58:44 +0200
commit7085775a115421e5fbecc02679da1558c5178e84 (patch)
treecd4fe3bc90b3ff33751ea62fec92fe241ab9ad67 /tests/auto
parent09d89118d973f427ed418047a2b404c45a552d83 (diff)
Prepare for QtQuick2 based declarative elements.
Disable the QDeclarativeItem based components until they are ported to scenegraph, and bump the revision to 4.0 (Once things are final, we can make it 5.0). Change-Id: Ib9c064722b80c38e711fbadc66966597c14a2b1a Reviewed-on: http://codereview.qt.nokia.com/1685 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/multimedia.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index c67a83817..aa3c7861b 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -42,7 +42,9 @@ contains (QT_CONFIG, declarative) {
SUBDIRS += \
qsoundeffect \
qdeclarativeaudio \
- qdeclarativevideo
+
+
+ disabled:SUBDIRS += qdeclarativevideo
}
}