summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-08-14 15:18:48 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-08-14 15:18:48 (GMT)
commit9db9c1f2215e32047c7329ab769d54dd3c1ddeb7 (patch)
tree98acb9a60cf237138f939b5dadb0d9ae7722ddeb /examples
parente9d32707afeddfdd2906af7bed60c375b1035dd6 (diff)
parent3c8f4512df30dee4a867a498fff6d2b27b881e4b (diff)
downloadQt-9db9c1f2215e32047c7329ab769d54dd3c1ddeb7.zip
Qt-9db9c1f2215e32047c7329ab769d54dd3c1ddeb7.tar.gz
Qt-9db9c1f2215e32047c7329ab769d54dd3c1ddeb7.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples')
-rw-r--r--examples/phonon/musicplayer/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp
index 7403e33..a20d05f 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/musicplayer/mainwindow.cpp
@@ -184,7 +184,7 @@ void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldSt
QMessageBox::warning(this, tr("Error opening files"),
metaInformationResolver->errorString());
while (!sources.isEmpty() &&
- !(sources.takeLast() == metaInformationResolver->currentSource()));
+ !(sources.takeLast() == metaInformationResolver->currentSource())) /* loop */;
return;
}