summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-20 07:48:26 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-20 07:48:26 (GMT)
commiteeac9aa8d51b11f3040dcf818cec0a58cd0898f0 (patch)
tree21c33e600d650aaa7cdbd412b4f4f3f721c879a0 /demos
parent256cadca060900078cfdc749e667f78ac954caea (diff)
parentf9d36789b4f2565f342f22d62a5106e5d5ca3389 (diff)
downloadQt-eeac9aa8d51b11f3040dcf818cec0a58cd0898f0.zip
Qt-eeac9aa8d51b11f3040dcf818cec0a58cd0898f0.tar.gz
Qt-eeac9aa8d51b11f3040dcf818cec0a58cd0898f0.tar.bz2
Merge branch 'mmfphonon' into 4.6
Diffstat (limited to 'demos')
-rw-r--r--demos/qmediaplayer/mediaplayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/demos/qmediaplayer/mediaplayer.cpp b/demos/qmediaplayer/mediaplayer.cpp
index baac236..e1ceb0e 100644
--- a/demos/qmediaplayer/mediaplayer.cpp
+++ b/demos/qmediaplayer/mediaplayer.cpp
@@ -367,6 +367,9 @@ void MediaPlayer::stateChanged(Phonon::State newstate, Phonon::State oldstate)
case Phonon::PausedState:
case Phonon::StoppedState:
playButton->setIcon(playIcon);
+
+ m_videoWidget->setFullScreen(false);
+
if (m_MediaObject.currentSource().type() != Phonon::MediaSource::Invalid){
playButton->setEnabled(true);
rewindButton->setEnabled(true);