summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-03-25 12:21:03 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-03-25 12:21:03 (GMT)
commita0548f2fc01a47c1b5de4d967d0bc920bd1867f6 (patch)
treefd5ff5254067df2fb016151e894d904ef9517f2a /tests
parent20073b78ca34deea244a999bbc221a63995869d8 (diff)
parent03686225036ebfc5cf78e3fcc66f5810a140c7d2 (diff)
downloadQt-a0548f2fc01a47c1b5de4d967d0bc920bd1867f6.zip
Qt-a0548f2fc01a47c1b5de4d967d0bc920bd1867f6.tar.gz
Qt-a0548f2fc01a47c1b5de4d967d0bc920bd1867f6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsoundeffect/tst_qsoundeffect.cpp8
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();