summaryrefslogtreecommitdiffstats
path: root/examples/qtconcurrent/imagescaling
diff options
context:
space:
mode:
Diffstat (limited to 'examples/qtconcurrent/imagescaling')
-rw-r--r--examples/qtconcurrent/imagescaling/imagescaling.cpp4
-rw-r--r--examples/qtconcurrent/imagescaling/imagescaling.h16
-rw-r--r--examples/qtconcurrent/imagescaling/main.cpp20
3 files changed, 0 insertions, 40 deletions
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.cpp b/examples/qtconcurrent/imagescaling/imagescaling.cpp
index 01083edb4e..9cc8ef655d 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 3c02db05b9..a84e2bdb6d 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.h
+++ b/examples/qtconcurrent/imagescaling/imagescaling.h
@@ -43,8 +43,6 @@
#include <QtWidgets>
#include <QtConcurrent>
-#ifndef QT_NO_CONCURRENT
-
class Images : public QWidget
{
Q_OBJECT
@@ -65,18 +63,4 @@ private:
QFutureWatcher<QImage> *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 ccdea2e771..442c8a4771 100644
--- a/examples/qtconcurrent/imagescaling/main.cpp
+++ b/examples/qtconcurrent/imagescaling/main.cpp
@@ -40,8 +40,6 @@
#include <QtWidgets>
#include <QtConcurrent>
-#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