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, 2 insertions, 0 deletions

diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index e461b64..7e0f466 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -1558,6 +1558,8 @@ void tst_QPixmap::loadFromDataImage_data()
     const QString prefix = QLatin1String(SRCDIR) + "/loadFromData";
 #endif
     QTest::newRow("designer_argb32.png") << prefix + "/designer_argb32.png";
+    // When no extension is provided we try all extensions that has been registered by image providers
+    QTest::newRow("designer_argb32") << prefix + "/designer_argb32.png";
     QTest::newRow("designer_indexed8_no_alpha.png") << prefix + "/designer_indexed8_no_alpha.png";
     QTest::newRow("designer_indexed8_with_alpha.png") << prefix + "/designer_indexed8_with_alpha.png";
     QTest::newRow("designer_rgb32.png") << prefix + "/designer_rgb32.png";