slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Conflicts:
	tests/auto/unit/qaudioformat/tst_qaudioformat.cpp

Change-Id: I8499473569df9eac8c7069160e42ed477dacad4d
This commit is contained in:
Frederik Gladhorn
2014-04-11 14:21:32 +02:00
parent a2303617ea 8a047ef087
commit 00c072bf0e
48 changed files with 690 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
View File

@@ -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()

3
tests/auto/unit/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp
View File

@@ -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

6
tests/auto/unit/qvideowidget/tst_qvideowidget.cpp
View File

@@ -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();