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 /tests/auto/other/atwrapper/atWrapper.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 'tests/auto/other/atwrapper/atWrapper.pro')
-rw-r--r-- | tests/auto/other/atwrapper/atWrapper.pro | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/other/atwrapper/atWrapper.pro b/tests/auto/other/atwrapper/atWrapper.pro index 5dcbdb98ce..9de320b364 100644 --- a/tests/auto/other/atwrapper/atWrapper.pro +++ b/tests/auto/other/atwrapper/atWrapper.pro @@ -1,9 +1,6 @@ -# -*- Mode: makefile -*- - ARTHUR=$$QT_SOURCE_TREE/tests/arthur COMMON_FOLDER = $$ARTHUR/common include($$ARTHUR/arthurtester.pri) -TEMPLATE = app INCLUDEPATH += $$ARTHUR DEFINES += SRCDIR=\\\"$$PWD\\\" @@ -15,7 +12,6 @@ include($$ARTHUR/datagenerator/datagenerator.pri) CONFIG += testcase -# Input HEADERS += atWrapper.h SOURCES += atWrapperAutotest.cpp atWrapper.cpp |