diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:21:32 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:22:22 +0200 |
commit | 00c072bf0eb25104086eb43e860e038af5f5d340 (patch) | |
tree | ead5b949d0a8314bdfd62dfe6fe900e27025c685 /tests/auto | |
parent | a2303617ea8d2cb118d0edc5e4b743d7c4dc8dfc (diff) | |
parent | 8a047ef087cebba5953ad3ed7b2d99df7966b695 (diff) | |
download | qtmultimedia-00c072bf0eb25104086eb43e860e038af5f5d340.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/unit/qaudioformat/tst_qaudioformat.cpp
Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d
Diffstat (limited to 'tests/auto')
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 57f820b54..fb946d760 100644 --- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -777,7 +777,7 @@ void tst_QDeclarativeAudio::playbackRate() audio.setPlaybackRate(2.0); QCOMPARE(audio.playbackRate(), qreal(2.0)); QCOMPARE(provider.playerControl()->playbackRate(), qreal(2.0)); - QCOMPARE(spy.count(), 3); + QCOMPARE(spy.count(), 2); } void tst_QDeclarativeAudio::status() diff --git a/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp index b0f7d8b73..1992dbc8a 100644 --- a/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp +++ b/tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp @@ -413,8 +413,7 @@ void tst_QMediaPlaylistNavigator::testCurrentIndexChangedSignal() { QMediaNetworkPlaylistProvider playlist; QMediaPlaylistNavigator navigator(&playlist); - navigator.setPlaybackMode(QMediaPlaylist::Random); - QCOMPARE(navigator.playbackMode(), QMediaPlaylist::Random); + QCOMPARE(navigator.playbackMode(), QMediaPlaylist::Sequential); QCOMPARE(navigator.currentIndex(), -1); //Creating a QSignalSpy object for currentIndexChanged() signal diff --git a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp index c6c9bc113..23e5699d9 100644 --- a/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/unit/qvideowidget/tst_qvideowidget.cpp @@ -907,7 +907,7 @@ void tst_QVideoWidget::fullScreenWindowControl() QtTestVideoObject object(new QtTestWindowControl, 0, 0); QVideoWidget widget; object.bind(&widget); - widget.show(); + widget.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); Qt::WindowFlags windowFlags = widget.windowFlags(); @@ -992,7 +992,7 @@ void tst_QVideoWidget::fullScreenWidgetControl() QtTestVideoObject object(0, new QtTestWidgetControl, 0); QVideoWidget widget; object.bind(&widget); - widget.show(); + widget.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); Qt::WindowFlags windowFlags = widget.windowFlags(); @@ -1078,7 +1078,7 @@ void tst_QVideoWidget::fullScreenRendererControl() QtTestVideoObject object(0, 0, new QtTestRendererControl); QVideoWidget widget; object.bind(&widget); - widget.show(); + widget.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); Qt::WindowFlags windowFlags = widget.windowFlags(); |