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: (24 commits)
  Fix MOBILITY-404
  Remove holes in bearer management data structures.
  Don't link bearer plugins against QtGui unnecessarily.
  Added missing newline after warning message when using -L with qml
  Doc: updating scripts
  Fixed a crash on embedded due to uninitialized pointer.
  Fix a race where QThread::exit() is "lost" when called after start()
  qdoc: Removed all <table> attributes in favor of using css.
  Autotest failure: dialogModality test fails on cocoa (macgui)
  Force the bic test to compile in 32-bit mode on Mac
  Revert "Doc: Updating design files."
  Remove statically allocated pixmaps through the post routine
  qdoc: Checked for empty title.
  qdoc: Added TOC to class ref pages.
  Cocoa: qwidget autotest fails on setToolTip
  Compile on Mac OS 10.4
  Bearer management changes from Qt Mobility (7a5ff985)
  Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors"
  Fix margins for placeholdertext in QLineEdit
  qdoc: Added TOC to module pages.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp
index 6afefca..6068d30 100644
--- a/examples/qtconcurrent/map/main.cpp
+++ b/examples/qtconcurrent/map/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
 
     // Use QtConcurrentBlocking::mapped to apply the scale function to all the
     // images in the list.
-    QList<QImage> thumbnails = QtConcurrent::blockingMapped<QList<QImage> >(images, scale);
+    QList<QImage> thumbnails = QtConcurrent::blockingMapped(images, scale);
 
     return 0;
 }