summaryrefslogtreecommitdiffstats
path: root/examples/qtconcurrent/imagescaling/imagescaling.pro
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-02-29 09:18:59 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2012-02-29 09:23:14 +1000
commit98dd1781d9256f68025d2a2db408f4f5947f3214 (patch)
treedbe1424abd90014edb5546c920ca585ed62b46e3 /examples/qtconcurrent/imagescaling/imagescaling.pro
parent6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff)
parentfa1b9070af66edb81b2a3735c1951f78b22bd666 (diff)
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac. Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'examples/qtconcurrent/imagescaling/imagescaling.pro')
-rw-r--r--examples/qtconcurrent/imagescaling/imagescaling.pro9
1 files changed, 1 insertions, 8 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)