diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-17 10:35:23 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-17 10:35:23 +0100 |
| commit | 1e179f6c0279adefc20924731b6e8378a89131de (patch) | |
| tree | 1ce899307c51f03a73c7093477e829ae4091da78 /src/3rdparty/phonon/mmf/abstractmediaplayer.h | |
| parent | 6c52715202ad8fd3c3f4bb94207cb7627c12f995 (diff) | |
| parent | 4631d297781b8ad4eba0735b7023265d4872c1cb (diff) | |
| download | qt4-tools-1e179f6c0279adefc20924731b6e8378a89131de.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'src/3rdparty/phonon/mmf/abstractmediaplayer.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractmediaplayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h index c3b4528f6f..df0a42f3f2 100644 --- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h +++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h @@ -75,7 +75,7 @@ protected: virtual int setDeviceVolume(int mmfVolume) = 0; virtual int openFile(const QString &fileName) = 0; virtual int openFile(RFile& file) = 0; - virtual int openUrl(const QString& url) = 0; + virtual int openUrl(const QString& url, int iap) = 0; virtual int openDescriptor(const TDesC8 &des) = 0; virtual int bufferStatus() const = 0; virtual void doClose() = 0; |