summaryrefslogtreecommitdiffstats
path: root/demos/qmediaplayer
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 16:35:57 (GMT)
commit50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch)
tree7517568b333bcc5679e7a165c48aaa7bd06a66fb /demos/qmediaplayer
parent61f013168e5ef5111948a1ae0a1464753986adb2 (diff)
parentce40a078caa4a09793128ca730cc5ca268aeee87 (diff)
downloadQt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.zip
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz
Qt-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'demos/qmediaplayer')
-rw-r--r--demos/qmediaplayer/mediaplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qmediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp
index 97a8e35..eb8279d 100644
--- a/demos/qmediaplayer/mediaplayer.cpp
+++ b/demos/qmediaplayer/mediaplayer.cpp
@@ -589,7 +589,7 @@ void MediaPlayer::configureEffect()
effectDialog.exec();
if (effectDialog.result() != QDialog::Accepted) {
- //we need to restore the paramaters values
+ //we need to restore the parameters values
int currentIndex = 0;
foreach(Phonon::EffectParameter param, nextEffect->parameters()) {
nextEffect->setParameterValue(param, savedParamValues.at(currentIndex++));