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/network/download | |
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/network/download')
-rw-r--r-- | examples/network/download/download.pro | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro index 7c53044f69..3eabedd375 100644 --- a/examples/network/download/download.pro +++ b/examples/network/download/download.pro @@ -1,14 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) fr. nov. 16 13:18:20 2007 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT = core network CONFIG += console -# Input SOURCES += main.cpp # install @@ -17,5 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download INSTALLS += target sources - simulator: warning(This example might not fully work on Simulator platform) |