diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-04-07 04:03:14 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-04-07 04:03:14 (GMT) |
commit | dd9376a096fa4e50cb5c192fc66c749e0e60a467 (patch) | |
tree | b8db380db6670c6bb4139c496695bbcd07c459e3 /examples | |
parent | c380aeefbfa2cd1aa2d1d21f45101bfb058a40de (diff) | |
parent | d4e0060d3e8961f0c802289dd6eebf9688be2fc7 (diff) | |
download | Qt-dd9376a096fa4e50cb5c192fc66c749e0e60a467.zip Qt-dd9376a096fa4e50cb5c192fc66c749e0e60a467.tar.gz Qt-dd9376a096fa4e50cb5c192fc66c749e0e60a467.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qtconcurrent/map/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp index 6068d30..6afefca 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(images, scale); + QList<QImage> thumbnails = QtConcurrent::blockingMapped<QList<QImage> >(images, scale); return 0; } |