diff options
| author | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-06 14:44:39 (GMT) |
| commit | daf5f511ee813fc4fffba64bed558d0413270388 (patch) | |
| tree | 37fefb6189943606d184d2159577f7f2ce67b5db /demos | |
| parent | 89b6de9091adbf0645ffe2aba59cb17cb233c170 (diff) | |
| parent | ded84966823eac0ae0275a2a7676d647d4d856ff (diff) | |
| download | Qt-daf5f511ee813fc4fffba64bed558d0413270388.zip Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.gz Qt-daf5f511ee813fc4fffba64bed558d0413270388.tar.bz2 | |
Merge branch '4.6-s60' into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qmediaplayer/mediaplayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h index 83f14e8..08db0e5 100644 --- a/demos/qmediaplayer/mediaplayer.h +++ b/demos/qmediaplayer/mediaplayer.h @@ -93,7 +93,6 @@ public slots: void playPause(); void scaleChanged(QAction *); void aspectChanged(QAction *); - void hasVideoChanged(bool); private slots: void setAspect(int); @@ -109,6 +108,7 @@ private slots: void bufferStatus(int percent); void openUrl(); void configureEffect(); + void hasVideoChanged(bool); private: QIcon playIcon; |