Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
  fix build with sqlite2
  respect UI_DIR when creating image collections
  Doc: more cleaning
  Doc: fixing escape character
  Doc: cleaning html generator
  Doc: changing index page
  Doc: fixing link to devnet
  Doc: adding HTML class names and style docs to the generator
  Doc: Fixing typo - background file name
  doc: Added doc for accessing views and models from delegates.
  Doc: Fixing broken link
  Doc: fixing typo
  Doc: fixing typos
  qdoc: Fixed table of contents for namespace pages.
  SSL backend: load libraries for certificates only once
  immediately set function context when entering a namespace
  Phonon MediaSource fails to load when passed as a resource file
  Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value
  qdoc: Fixed a few links to QtObject (QML:QtObject)
  Simplify *= to += after contains() test
  ...

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