diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-08 12:42:12 +0100 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-09 05:58:14 +0100 |
commit | b05039d5efcaec69d01d3737ccb5f0199765632b (patch) | |
tree | 162ad7dc2965087dc38e75e03e25031707309881 /tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro | |
parent | 5217eddc405565f09340d5ff4a881d833c03a201 (diff) |
Add QDeclarativeDataTest base class to locate test data.
- Remove TEST_FILE and TEST_DATA macros in favour of base
class that uses QFINDTESTDATA to locate the data.
This avoids repeated searching and handles Windows correctly
(executables in release/debug subfolders).
- Modeled after an existing class in the QtQuick2 tests
(see qtdeclarative\tests\auto\shared\util.*).
Change-Id: I9e595953328fb552648cef4c7f712d9000f53832
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro')
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index a65b723e..39435719 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -15,13 +15,7 @@ INCLUDEPATH += ../shared # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +include(../shared/qdeclarativedatatest.pri) CONFIG += parallel_test |