diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-08-03 19:14:44 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-08-03 19:14:44 (GMT) |
| commit | be83848d31513dfbfffb1e0c43d32b7c27dcefce (patch) | |
| tree | c8b965626afcb18cfaca0f26e39596ac4dd6f0a8 /src/3rdparty/phonon/mmf/dummyplayer.h | |
| parent | 7a2d31989f0f50a34550be846a6f632c2f9e3f59 (diff) | |
| parent | 11ad3b195d98b0a2234105da24d1faffd7ef95d6 (diff) | |
| download | Qt-be83848d31513dfbfffb1e0c43d32b7c27dcefce.zip Qt-be83848d31513dfbfffb1e0c43d32b7c27dcefce.tar.gz Qt-be83848d31513dfbfffb1e0c43d32b7c27dcefce.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Conflicts:
src/plugins/bearer/connman/qconnmanengine.cpp
Diffstat (limited to 'src/3rdparty/phonon/mmf/dummyplayer.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/dummyplayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/dummyplayer.h b/src/3rdparty/phonon/mmf/dummyplayer.h index 9d45696..5b00411 100644 --- a/src/3rdparty/phonon/mmf/dummyplayer.h +++ b/src/3rdparty/phonon/mmf/dummyplayer.h @@ -57,7 +57,7 @@ public: virtual qint64 totalTime() const; // AbstractPlayer - virtual void open(const Phonon::MediaSource&, RFile&); + virtual void open(); virtual void close(); virtual void doSetTickInterval(qint32 interval); }; |