diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 17:03:54 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 17:03:54 (GMT) |
commit | 2aa8526f05c9e3b2b1ee45bf0653600640aa622e (patch) | |
tree | 1f15b6bb3f1dc769eefd96f9a3128a5703160bd4 /tests/benchmarks/declarative/script/tst_script.cpp | |
parent | 8a97a1cac688d0e6e6aef40bfa396a81d7bfc0b8 (diff) | |
parent | 219a7248733a8f9dce8674aab405e5223693f0a2 (diff) | |
download | Qt-2aa8526f05c9e3b2b1ee45bf0653600640aa622e.zip Qt-2aa8526f05c9e3b2b1ee45bf0653600640aa622e.tar.gz Qt-2aa8526f05c9e3b2b1ee45bf0653600640aa622e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (25 commits)
Freetype is not used on symbian, don't use it.
Disable compiling unsupported classes for Symbian
Make the 'freeze' target work for linux/symbian.
Update QtDeclarative .def files for 4.7
Improve virtual mouse on E72 optical joystick
Fix build break in Symbian
Set edit focus to proper control in flightinfo demo
Update symbian def files for 4.7
Do not autopatch <app>_installer.pkg when self-signing
Fix pkg_prerules handling for installer packages
Fix weatherinfo and flightinfo to only request WLAN connection once
Fix 'chapter5_plugins.dll.sym contains initialized writable data'
Fix generation of stub sis files
Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks
Shadow building on Symbian fixes: part 3 - unchanged source tree
Shadow building on Symbian fixes: part 2 - populate bin dir correctly
Shadow building on Symbian fixes: part 1 - files to right place
Re-enable suppression of --export_all_vtbl for static libraries
Omit building declarative/painting benchmark if no OpenGL configured
Fix requires keyword handling in qmake in Symbian
...
Diffstat (limited to 'tests/benchmarks/declarative/script/tst_script.cpp')
-rw-r--r-- | tests/benchmarks/declarative/script/tst_script.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp index 6dc7ed6..99f294c 100644 --- a/tests/benchmarks/declarative/script/tst_script.cpp +++ b/tests/benchmarks/declarative/script/tst_script.cpp @@ -48,6 +48,11 @@ #include <QScriptEngine> #include <QScriptValue> +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + class tst_script : public QObject { Q_OBJECT |