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:
  qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGS
  qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGS
  Revised fix for pixmap loading
  Assistant: Clean-up - fix spelling mistakes.
  Assistant: Clean-up: Use const references in foreach loops.
  Assistant: Clean-up: Mark constructors as explicit.
  Assistant: Clean-up - add newlines to end of files.
  Doc: Changes to the index page and second level pages linking to the index page.
  Use Ctrl rather than Alt for switching tabs in the demo browser
  Doc: fixing creator bugs, removing menus and textbox in the header
  Update Japanese translations
  Ukrainian translation updated
  qtconfig and qvfb internationalization fixes
  add full width characters to ending() in linguist
  QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter
  qdoc: Changed id attribute to be a UUID.
  just build connman and networkmanager plugins on linux

1 files changed, 5 insertions, 0 deletions

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 1c0ceff..c039ca8 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -836,6 +836,11 @@ bool QPixmap::load(const QString &fileName, const char *format, Qt::ImageConvers
                   % HexString<quint64>(info.size())
                   % HexString<uint>(data ? data->pixelType() : QPixmapData::PixmapType);
 
+    // Note: If no extension is provided, we try to match the 
+    // file against known plugin extensions
+    if (!info.completeSuffix().isEmpty() && !info.exists())
+        return false;
+
     if (QPixmapCache::find(key, *this))
         return true;