diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /examples/qtconcurrent | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'examples/qtconcurrent')
| -rw-r--r-- | examples/qtconcurrent/imagescaling/imagescaling.pro | 9 | ||||
| -rw-r--r-- | examples/qtconcurrent/map/map.pro | 6 | ||||
| -rw-r--r-- | examples/qtconcurrent/progressdialog/progressdialog.pro | 10 | ||||
| -rw-r--r-- | examples/qtconcurrent/runfunction/runfunction.pro | 10 | ||||
| -rw-r--r-- | examples/qtconcurrent/wordcount/wordcount.pro | 10 |
5 files changed, 8 insertions, 37 deletions
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index b268aa75f2..b959915a55 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -1,20 +1,13 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . -QT += concurrent +QT += concurrent widgets -# Input SOURCES += main.cpp imagescaling.cpp HEADERS += imagescaling.h -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling INSTALLS += target sources - wince*: DEPLOYMENT_PLUGIN += qgif qjpeg -QT += widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro index 72f770755f..994c266e9b 100644 --- a/examples/qtconcurrent/map/map.pro +++ b/examples/qtconcurrent/map/map.pro @@ -1,14 +1,10 @@ TEMPLATE = app TARGET = mapdemo -DEPENDPATH += . -INCLUDEPATH += . QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro index 75a3aba0ae..3ec3243b6a 100644 --- a/examples/qtconcurrent/progressdialog/progressdialog.pro +++ b/examples/qtconcurrent/progressdialog/progressdialog.pro @@ -1,17 +1,11 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog INSTALLS += target sources -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 f047577c9f..1ac02f6fa2 100644 --- a/examples/qtconcurrent/runfunction/runfunction.pro +++ b/examples/qtconcurrent/runfunction/runfunction.pro @@ -1,17 +1,11 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction INSTALLS += target sources -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 3bddf1a862..8b6bf8104a 100644 --- a/examples/qtconcurrent/wordcount/wordcount.pro +++ b/examples/qtconcurrent/wordcount/wordcount.pro @@ -1,17 +1,11 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount INSTALLS += target sources -QT += concurrent widgets - simulator: warning(This example does not work on Simulator platform) |