diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-07-07 13:38:22 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2010-07-07 13:41:00 (GMT) |
| commit | 495dfda1bea31017d08a435dcb61b43b4df81d24 (patch) | |
| tree | 41fb07da9b02ae52e41ad1fd8da8edfa657ab8dd /src/3rdparty | |
| parent | 6f6ec0ee680c7d4b5cf70116e756cca90668fd90 (diff) | |
| download | Qt-495dfda1bea31017d08a435dcb61b43b4df81d24.zip Qt-495dfda1bea31017d08a435dcb61b43b4df81d24.tar.gz Qt-495dfda1bea31017d08a435dcb61b43b4df81d24.tar.bz2 | |
Phonon MediaSource fails to load when passed as a resource file
Files fail to load when passing resoure path to mediasource.
The original regression seems to be caused by a behavior change
as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015
Note a merge request is also pending on Gitorious
http://gitorious.org/phonon/phonon/merge_requests/17
Task-number: QTBUG-9323
Reviewed-by: thierry
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/phonon/mediasource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index be22dc3..11d2428 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -50,7 +50,7 @@ MediaSource::MediaSource(const QString &filename) const QFileInfo fileInfo(filename); if (fileInfo.exists()) { bool localFs = QAbstractFileEngine::LocalDiskFlag & QFSFileEngine(filename).fileFlags(QAbstractFileEngine::LocalDiskFlag); - if (localFs) { + if (localFs && !filename.startsWith(QLatin1String(":/")) && !filename.startsWith(QLatin1String("qrc://"))) { d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); } else { #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM |