diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 11:22:08 +1000 |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2012-01-31 06:33:34 +0100 |
commit | dbf35e498db723ae9850686e462ec4f45bc7b67c (patch) | |
tree | cf1f98717e131f26e5a6d63f6693935b2fbdb76f /tests/auto/declarative/parserstress | |
parent | 12a5ddf456ba8549645a8cb28a8b4ed6197a14da (diff) |
Modify QtQuick1 to build in Qt5
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/parserstress')
-rw-r--r-- | tests/auto/declarative/parserstress/parserstress.pro | 7 | ||||
-rw-r--r-- | tests/auto/declarative/parserstress/tst_parserstress.cpp | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro index 6ef2432b..ace91cd2 100644 --- a/tests/auto/declarative/parserstress/parserstress.pro +++ b/tests/auto/declarative/parserstress/parserstress.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative +CONFIG += testcase +TARGET = tst_parserstress + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 macx:CONFIG -= app_bundle SOURCES += tst_parserstress.cpp diff --git a/tests/auto/declarative/parserstress/tst_parserstress.cpp b/tests/auto/declarative/parserstress/tst_parserstress.cpp index 33896d52..504e09e0 100644 --- a/tests/auto/declarative/parserstress/tst_parserstress.cpp +++ b/tests/auto/declarative/parserstress/tst_parserstress.cpp @@ -94,11 +94,7 @@ void tst_parserstress::ecmascript_data() #ifdef Q_OS_SYMBIAN QDir dir("tests"); #else - QDir dir(SRCDIR); - dir.cdUp(); - dir.cdUp(); - dir.cd("qscriptjstestsuite"); - dir.cd("tests"); + QDir dir(SRCDIR "../../qscriptjstestsuite/tests"); #endif QStringList files = findJSFiles(dir); @@ -110,6 +106,8 @@ void tst_parserstress::ecmascript_data() void tst_parserstress::ecmascript() { + QSKIP("Test data (located in the QtScript module) not currently available"); + QFETCH(QString, file); QFile f(file); |