diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-02-03 14:17:26 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-05 17:49:16 +0100 |
| commit | 96501b0a18f4f70048403dccc4cb42dd71db8f9d (patch) | |
| tree | ec4b95139854d1116ad75467c3c08df39fafeb27 /examples | |
| parent | c8156cab81690526adffa22214657fc1c6563b8b (diff) | |
Move QtConcurrent into its own module
Task-number: QTBUG-20892
Change-Id: I614500aafb6428915509983608bbb0ade4e4f016
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'examples')
10 files changed, 11 insertions, 5 deletions
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.h b/examples/qtconcurrent/imagescaling/imagescaling.h index 204a297ef3..1f68a3838a 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.h +++ b/examples/qtconcurrent/imagescaling/imagescaling.h @@ -41,6 +41,7 @@ #define IMAGESCALING_H #include <QtWidgets> +#include <QtConcurrent> #ifndef QT_NO_CONCURRENT diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index 2ec5abddf6..b268aa75f2 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -1,6 +1,7 @@ TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . +QT += concurrent # Input SOURCES += main.cpp imagescaling.cpp diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp index f7a359c2af..9fef7d3100 100644 --- a/examples/qtconcurrent/imagescaling/main.cpp +++ b/examples/qtconcurrent/imagescaling/main.cpp @@ -38,6 +38,7 @@ ** ****************************************************************************/ #include <QtWidgets> +#include <QtConcurrent> #ifndef QT_NO_CONCURRENT diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro index 978eae44b9..72f770755f 100644 --- a/examples/qtconcurrent/map/map.pro +++ b/examples/qtconcurrent/map/map.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = mapdemo DEPENDPATH += . INCLUDEPATH += . +QT += concurrent widgets # Input SOURCES += main.cpp @@ -13,6 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map INSTALLS += target sources -QT += widgets - simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index b26824c172..87ea4f5486 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #include <QtWidgets> +#include <QtConcurrent> #ifndef QT_NO_CONCURRENT diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro index fbc239d199..75a3aba0ae 100644 --- a/examples/qtconcurrent/progressdialog/progressdialog.pro +++ b/examples/qtconcurrent/progressdialog/progressdialog.pro @@ -12,6 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog INSTALLS += target sources -QT += widgets +QT += concurrent widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro index d41b88e2b0..f047577c9f 100644 --- a/examples/qtconcurrent/runfunction/runfunction.pro +++ b/examples/qtconcurrent/runfunction/runfunction.pro @@ -12,6 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction INSTALLS += target sources -QT += widgets +QT += concurrent widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro index ee4887c0f1..3bddf1a862 100644 --- a/examples/qtconcurrent/wordcount/wordcount.pro +++ b/examples/qtconcurrent/wordcount/wordcount.pro @@ -12,6 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount INSTALLS += target sources -QT += widgets +QT += concurrent widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp b/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp index fb8f55db94..02aed98c1d 100644 --- a/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp +++ b/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp @@ -39,6 +39,8 @@ ****************************************************************************/ #include <QtCore> +#include <QtConcurrent> + /* says hello from main thread and secondary thread using QtConcurrent */ diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro index fb3cd0b394..1941666755 100644 --- a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro +++ b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro @@ -1,4 +1,5 @@ QT -= gui +QT += concurrent CONFIG += console CONFIG -= app_bundle |