diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-20 12:19:09 (GMT) |
| commit | b5294497836db44261c97cfeab28d0ac4f8402f1 (patch) | |
| tree | c4331314445b41166ce2cd22a80c9fb9f46b5023 /demos/qmediaplayer/mediaplayer.h | |
| parent | 2473ab1cf217a989849190cbfa47fe312698adb9 (diff) | |
| parent | 1b8d5bec5763708c66e7bd586aee3df7f94b5cb5 (diff) | |
| download | Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.zip Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.gz Qt-b5294497836db44261c97cfeab28d0ac4f8402f1.tar.bz2 | |
Merge branch '4.6' into mmfphonon
Conflicts:
demos/qmediaplayer/mediaplayer.cpp
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 00f9b54..14ed4ac 100644 --- a/demos/qmediaplayer/mediaplayer.h +++ b/demos/qmediaplayer/mediaplayer.h @@ -139,6 +139,7 @@ private slots: void showContextMenu(const QPoint& point); void bufferStatus(int percent); void openUrl(); + void openRamFile(); void configureEffect(); void hasVideoChanged(bool); |