diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 05:17:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 05:17:49 (GMT) |
| commit | 194013d9db1b3e4ba6f56a864f3b64f523202948 (patch) | |
| tree | 7088302db57651f87e61bfac027d9f792e18eadb /tests | |
| parent | 020249df9d920e1bf783dd802f66761c4b7e123c (diff) | |
| parent | 444e8812eec42abd2dcc5e47826f9a4793a34f66 (diff) | |
| download | Qt-194013d9db1b3e4ba6f56a864f3b64f523202948.zip Qt-194013d9db1b3e4ba6f56a864f3b64f523202948.tar.gz Qt-194013d9db1b3e4ba6f56a864f3b64f523202948.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:
Rename loopCount to loops, in line with other declarative elements.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qsoundeffect/tst_qsoundeffect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/qsoundeffect/tst_qsoundeffect.cpp index b918816..e76a4c5 100644 --- a/tests/auto/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/qsoundeffect/tst_qsoundeffect.cpp @@ -72,7 +72,7 @@ void tst_QSoundEffect::initTestCase() sound = new QSoundEffect; QVERIFY(sound->source().isEmpty()); - QVERIFY(sound->loopCount() == 1); + QVERIFY(sound->loops() == 1); QVERIFY(sound->volume() == 100); QVERIFY(sound->isMuted() == false); #endif @@ -99,10 +99,10 @@ void tst_QSoundEffect::testSource() void tst_QSoundEffect::testLooping() { #ifndef QT_MULTIMEDIA_QMEDIAPLAYER - QSignalSpy readSignal(sound, SIGNAL(loopCountChanged())); + QSignalSpy readSignal(sound, SIGNAL(loopsChanged())); - sound->setLoopCount(5); - QCOMPARE(sound->loopCount(),5); + sound->setLoops(5); + QCOMPARE(sound->loops(),5); sound->play(); |