diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-25 15:24:01 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-25 15:24:01 (GMT) |
| commit | 143fbe251f626bc74e4f90fee55deddecb50d627 (patch) | |
| tree | 3e22a991954dc7c291c5c58adb7b76648b439a8c /demos/qmediaplayer/mediaplayer.h | |
| parent | e58b0e2e562f1c5284ced8671d85df748a4a9639 (diff) | |
| parent | 7b845236d8670bb9cb5884ea60f422d09dafd89c (diff) | |
| download | Qt-143fbe251f626bc74e4f90fee55deddecb50d627.zip Qt-143fbe251f626bc74e4f90fee55deddecb50d627.tar.gz Qt-143fbe251f626bc74e4f90fee55deddecb50d627.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'demos/qmediaplayer/mediaplayer.h')
| -rw-r--r-- | demos/qmediaplayer/mediaplayer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demos/qmediaplayer/mediaplayer.h b/demos/qmediaplayer/mediaplayer.h index a1c3d92..a8f18f0 100644 --- a/demos/qmediaplayer/mediaplayer.h +++ b/demos/qmediaplayer/mediaplayer.h @@ -107,6 +107,7 @@ private slots: void showContextMenu(const QPoint &); void bufferStatus(int percent); void openUrl(); + void openRamFile(); void configureEffect(); void hasVideoChanged(bool); |