diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp index 01083edb4ee..9cc8ef655d5 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.cpp +++ b/examples/qtconcurrent/imagescaling/imagescaling.cpp @@ -40,8 +40,6 @@ #include "imagescaling.h" #include "math.h" -#ifndef QT_NO_CONCURRENT - const int imageSize = 100; QImage scale(const QString &imageFileName) @@ -141,5 +139,3 @@ void Images::finished() cancelButton->setEnabled(false); pauseButton->setEnabled(false); } - -#endif // QT_NO_CONCURRENT diff --git a/examples/qtconcurrent/imagescaling/imagescaling.h b/examples/qtconcurrent/imagescaling/imagescaling.h index 3c02db05b91..a84e2bdb6d6 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.h +++ b/examples/qtconcurrent/imagescaling/imagescaling.h @@ -43,8 +43,6 @@ #include #include -#ifndef QT_NO_CONCURRENT - class Images : public QWidget { Q_OBJECT @@ -65,18 +63,4 @@ private: QFutureWatcher *imageScaling; }; -#else - -// Dummy class required because QT_NO_CONCURRENT is not set when moc is run. -class Images : public QWidget -{ -Q_OBJECT -public Q_SLOTS: - void open() {} - void showImage(int) {} - void finished() {} -}; - -#endif // QT_NO_CONCURRENT - #endif // IMAGESCALING_H diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp index ccdea2e7716..442c8a47716 100644 --- a/examples/qtconcurrent/imagescaling/main.cpp +++ b/examples/qtconcurrent/imagescaling/main.cpp @@ -40,8 +40,6 @@ #include #include -#ifndef QT_NO_CONCURRENT - #include "imagescaling.h" int main(int argc, char *argv[]) @@ -53,21 +51,3 @@ int main(int argc, char *argv[]) return app.exec(); } - -#else - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - QString text("Qt Concurrent is not supported on this platform"); - - QLabel *label = new QLabel(text); - label->setWordWrap(true); - - label->show(); - qDebug() << text; - - app.exec(); -} - -#endif diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index c646105db69..01d4aef2566 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -41,8 +41,6 @@ #include #include -#ifndef QT_NO_CONCURRENT - using namespace QtConcurrent; const int iterations = 20; @@ -88,22 +86,3 @@ int main(int argc, char **argv) // Query the future to check if was canceled. qDebug() << "Canceled?" << futureWatcher.future().isCanceled(); } - -#else - -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 - diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp index 0e62bd0a75a..85c5e1267a2 100644 --- a/examples/qtconcurrent/runfunction/main.cpp +++ b/examples/qtconcurrent/runfunction/main.cpp @@ -44,8 +44,6 @@ #include #include -#ifndef QT_NO_CONCURRENT - using namespace QtConcurrent; void hello(QString name) @@ -61,23 +59,3 @@ int main(int argc, char **argv) f1.waitForFinished(); f2.waitForFinished(); } - -#else - -#include - -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 diff --git a/examples/qtconcurrent/wordcount/main.cpp b/examples/qtconcurrent/wordcount/main.cpp index 635951fd4aa..408e92dbb38 100644 --- a/examples/qtconcurrent/wordcount/main.cpp +++ b/examples/qtconcurrent/wordcount/main.cpp @@ -50,8 +50,6 @@ #include -#ifndef QT_NO_CONCURRENT - using namespace QtConcurrent; /* @@ -155,23 +153,3 @@ int main(int argc, char** argv) } qDebug() << "MapReduce speedup x" << ((double)singleThreadTime - (double)mapReduceTime) / (double)mapReduceTime + 1; } - -#else - -#include - -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