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/threads/waitconditions/waitconditions.pro | |
| 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/threads/waitconditions/waitconditions.pro')
| -rw-r--r-- | examples/threads/waitconditions/waitconditions.pro | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index 6a3d63b641..29ef9b8334 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -1,16 +1,8 @@ -###################################################################### -# Automatically generated by qmake (1.08a) Fri Jan 7 15:25:07 2005 -###################################################################### - -TEMPLATE = app QT = core gui CONFIG -= moc app_bundle -DEPENDPATH += . -INCLUDEPATH += . +CONFIG += console -# Input SOURCES += waitconditions.cpp -CONFIG += qt warn_on create_prl link_prl console # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions @@ -18,5 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions INSTALLS += target sources - simulator: warning(This example might not fully work on Simulator platform) |