summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-10-08 12:09:46 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-16 17:10:15 +0200
commit677825f0bad9ee8fb48edf3d4b18799d298767c5 (patch)
tree66431aaa060367eb7222b4cf61f53051d066e30b /examples
parent5d4eda78332e931394042948f9436586b221c83f (diff)
remove non-concurrent branch from concurrent example
kinda stupid to have it ... Change-Id: Icb31c524e04f43b0fb966c5500e22dfd574f969f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/qtconcurrent/map/main.cpp22
1 files changed, 0 insertions, 22 deletions
diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp
index 199273b9a6..01595f0c2e 100644
--- a/examples/qtconcurrent/map/main.cpp
+++ b/examples/qtconcurrent/map/main.cpp
@@ -45,8 +45,6 @@
#include <QGuiApplication>
#include <qtconcurrentmap.h>
-#ifndef QT_NO_CONCURRENT
-
QImage scale(const QImage &image)
{
qDebug() << "Scaling image in thread" << QThread::currentThread();
@@ -70,23 +68,3 @@ int main(int argc, char *argv[])
return 0;
}
-
-#else
-
-#include <QLabel>
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv);
- QString text("Qt Concurrent is not yet supported on this platform");
-
- QLabel *label = new QLabel(text);
- label->setWordWrap(true);
-
- label->show();
- qDebug() << text;
-
- app.exec();
-}
-
-#endif