summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-02 11:10:14 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-08-02 12:07:42 (GMT)
commit1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7 (patch)
treeb634362fa1cfdfc869e1412b6caa8cc6f5a76e08 /src/3rdparty
parent7f4e72f438362da7b862ea682f36ec959070e1cb (diff)
downloadQt-1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7.zip
Qt-1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7.tar.gz
Qt-1c7c6e2326b2f89bdf564cebe89ff6f95c3f17d7.tar.bz2
Fixed build break on Symbian versions earlier than S^3
The following overload was added in S^3: TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const In order to allow the backend to compile against earlier versions of the platform, this patch calls the RecognizeData overload which taking the same arguments as above, plus a filename (for which KNullDesC is passed). Task-number: QTBUG-6562 Reviewed-by: trustme
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/phonon/mmf/mediaobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp
index b476535..98326b8 100644
--- a/src/3rdparty/phonon/mmf/mediaobject.cpp
+++ b/src/3rdparty/phonon/mmf/mediaobject.cpp
@@ -158,7 +158,7 @@ MMF::MediaType MMF::MediaObject::bufferMediaType(const uchar *data, qint64 size)
if (openRecognizer()) {
TDataRecognitionResult recognizerResult;
const TPtrC8 des(data, size);
- const TInt err = m_recognizer.RecognizeData(des, recognizerResult);
+ const TInt err = m_recognizer.RecognizeData(KNullDesC, des, recognizerResult);
if (KErrNone == err) {
const TPtrC mimeType = recognizerResult.iDataType.Des();
result = Utils::mimeTypeToMediaType(mimeType);