diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-12 08:52:10 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-12 08:52:10 (GMT) |
commit | c84749652f59d19fd1c5f611e8d105464f8bc673 (patch) | |
tree | 4d6453c3f51f630d90712156bf659470f2950ddc /tests/auto/qscriptengine | |
parent | bceb9733ceae86612adb622d88d6681a13ccd52c (diff) | |
download | Qt-c84749652f59d19fd1c5f611e8d105464f8bc673.zip Qt-c84749652f59d19fd1c5f611e8d105464f8bc673.tar.gz Qt-c84749652f59d19fd1c5f611e8d105464f8bc673.tar.bz2 |
Fixed SRCDIR usage in qscriptengine test for Symbian
Diffstat (limited to 'tests/auto/qscriptengine')
-rw-r--r-- | tests/auto/qscriptengine/qscriptengine.pro | 1 | ||||
-rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro index c33b979..4d1828f 100644 --- a/tests/auto/qscriptengine/qscriptengine.pro +++ b/tests/auto/qscriptengine/qscriptengine.pro @@ -10,5 +10,6 @@ wince*|symbian*: { } symbian: { + DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x","")) TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" } diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index de3a6aa..cb2ab2e 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -49,16 +49,17 @@ #include <qstandarditemmodel.h> #include <QtCore/qnumeric.h> -#if defined(Q_OS_SYMBIAN) -# define SRCDIR "" -#endif - Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QObjectList) //TESTED_CLASS= //TESTED_FILES= +#if defined(Q_OS_SYMBIAN) +# define STRINGIFY(x) #x +# define TOSTRING(x) STRINGIFY(x) +# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) +#endif class tst_QScriptEngine : public QObject { Q_OBJECT @@ -231,7 +232,7 @@ void tst_QScriptEngine::newFunction() QCOMPARE(fun.prototype().isValid(), true); QCOMPARE(fun.prototype().isFunction(), true); QCOMPARE(fun.prototype().strictlyEquals(eng.evaluate("Function.prototype")), true); - + QCOMPARE(fun.call().isNull(), true); QCOMPARE(fun.construct().isObject(), true); } |