Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

Conflicts:
	src/declarative/util/qmlanimation.cpp
	src/declarative/util/qmlxmllistmodel.cpp

2 files changed, 16 insertions, 1 deletions

diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro
index 48fea81..6255acc 100644
--- a/tests/benchmarks/declarative/script/script.pro
+++ b/tests/benchmarks/declarative/script/script.pro
@@ -7,5 +7,14 @@ CONFIG += release
 
 SOURCES += tst_script.cpp
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian* {
+    data.sources = data/*
+    data.path = data
+    DEPLOYMENT += data
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+
+
 
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index a90a98b..a11fe31 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -48,6 +48,12 @@
 #include <QScriptEngine>
 #include <QScriptValue>
 
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+// Application private dir is default serach path for files, so SRCDIR can be set to empty
+#define SRCDIR "."
+#endif
+
 class tst_script : public QObject
 {
     Q_OBJECT