summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-27 13:03:12 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-27 13:03:12 +1000
commitdb5f67926ebb5430cc75d00a8d39614c9ce5cda0 (patch)
tree23b37e6aa6106a849db2dbbbb4e25e8726801663
parent52364069b83cd95c73f06973cd4eaadec63083e4 (diff)
parent548f80552beb86e5f3218ded6ad7583c6660c91d (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging: tests: mark tst_mediaobject as unstable
-rwxr-xr-xtests/auto/mediaobject/mediaobject.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/mediaobject/mediaobject.pro b/tests/auto/mediaobject/mediaobject.pro
index 23ec56b..3377d9c 100755
--- a/tests/auto/mediaobject/mediaobject.pro
+++ b/tests/auto/mediaobject/mediaobject.pro
@@ -9,6 +9,8 @@ SOURCES += tst_mediaobject.cpp
HEADERS += qtesthelper.h
RESOURCES += mediaobject.qrc
+CONFIG += insignificant_test # QTBUG-19539
+
wince*{
DEPLOYMENT_PLUGIN += phonon_waveout
DEFINES += tst_MediaObject=tst_MediaObject_waveout