summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-04-14 06:36:55 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-04-14 06:36:55 (GMT)
commita683587a5ffd07366d60f1c4eb56aaee090fcbc4 (patch)
tree2403a648b9b0a4bd68823cdfa38a9d69e2252100 /examples
parent90de3e5c903b67b2e5f3d7dc14266fe24f1daa23 (diff)
parente2b31c909912c24bd87a4454dca8ae766e9aca52 (diff)
downloadQt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.zip
Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.tar.gz
Qt-a683587a5ffd07366d60f1c4eb56aaee090fcbc4.tar.bz2
Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash
Diffstat (limited to 'examples')
-rw-r--r--examples/qtconcurrent/map/main.cpp2
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;
}