summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-13 21:35:01 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-04-27 06:30:01 (GMT)
commit345510ddd92c2adb686b6030bc9e1a82bd05e051 (patch)
treea62cecf7bd47e2c30775ceba045fd0cc38af53a3
parent1a3c480d51f435dfac25d51f45331438b4c59800 (diff)
downloadQt-345510ddd92c2adb686b6030bc9e1a82bd05e051.zip
Qt-345510ddd92c2adb686b6030bc9e1a82bd05e051.tar.gz
Qt-345510ddd92c2adb686b6030bc9e1a82bd05e051.tar.bz2
Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors"
The compile fix for SunCC caused a build failure for MinGW with gcc 3.4. However, QtConcurrent is not supported for Sun CC, so revert the fix (let mingw compile and SunCC break). This reverts part of commit a354e98838e67e9bbd9473d4cd42b89f45d0e3fe (MR 547). (cherry picked from commit 756c8e10b96f4b4f7b2e3d2d2c248ec261a3d407)
-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;
}