diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-14 17:49:56 +0200 |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-14 17:49:56 +0200 |
| commit | 8fd9cbc859346d758bb730e85c679635f00940df (patch) | |
| tree | bc3b10d79a458933b1f481bd7e88d1a633e7bc1e /tests/auto/qscriptv8testsuite | |
| parent | 65b788014759fa06d65d1677b3dbd5cc4b596f6b (diff) | |
| parent | 06af27069497a693f5b1a867b29d96297f68eb75 (diff) | |
| download | qt4-tools-8fd9cbc859346d758bb730e85c679635f00940df.tar.gz | |
Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend
Conflicts:
src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp
src/script/qscriptecmafunction.cpp
src/script/qscriptecmaglobal.cpp
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptenginefwd_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
tests/auto/qscriptqobject/tst_qscriptqobject.cpp
Diffstat (limited to 'tests/auto/qscriptv8testsuite')
| -rw-r--r-- | tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro index 9e358013d0..c07ab531f7 100644 --- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro +++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro @@ -1,6 +1,7 @@ load(qttest_p4) QT = core script SOURCES += tst_qscriptv8testsuite.cpp +DEFINES += SRCDIR=\\\"$$PWD\\\" wince*: { testFiles.sources = tests diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 19f5eb7076..b59e397745 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -193,7 +193,7 @@ int tst_Suite::qt_metacall(QMetaObject::Call _c, int _id, void **_a) tst_Suite::tst_Suite() { - testsDir = QDir("."); + testsDir = QDir(SRCDIR); bool testsFound = testsDir.cd("tests"); if (!testsFound) { qWarning("*** no tests/ dir!"); |