diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:52 +0100 |
| commit | a6826cbe243a22f25b451d0aaa5ae4536f9f3656 (patch) | |
| tree | 2900595e38fdf730aae6f37c82473d43cc3b0f65 /tests/auto | |
| parent | 6c387974ab827e53d96d9106a44df29584c1e2be (diff) | |
| parent | c3d90662dfc65dd5f0dd8e5cd31d1bafb3328e7c (diff) | |
| download | qtscript-a6826cbe243a22f25b451d0aaa5ae4536f9f3656.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ic32f5bd17782285305aaa01694f1a78851b882eb
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro index 105fc97..91e1b64 100644 --- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro +++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro @@ -5,8 +5,6 @@ SOURCES += tst_qscriptjstestsuite.cpp RESOURCES += qscriptjstestsuite.qrc include(../qscriptv8testsuite/abstracttestsuite.pri) -DEFINES += SRCDIR=\\\"$$PWD\\\" - wince* { testFiles.files = tests testFiles.path = . diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 944e741..13668c6 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -320,7 +320,7 @@ void tst_QScriptJSTestSuite::runTestFunction(int testIndex) tst_QScriptJSTestSuite::tst_QScriptJSTestSuite() : AbstractTestSuite("tst_QScriptJsTestSuite", - QString::fromLatin1("%0/tests").arg(SRCDIR), + QFINDTESTDATA("tests"), ":/") { // don't execute any tests on slow machines |