Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Qt.include() support in worker scripts
  Only add "include" property in non-workerscript threads
  Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89
  Reduce the chance of AnchorAnimation animating geometry changes it
  Add Qt.include() method for scoped inclusion of JavaScript files
  Fix crash in ParentAnimation.
  Revert "Fix crash in ParentAnimation."
  Symbian build fix to declarative auto and benchmark tests
  Revert "Use raster graphicssystem for qml.app on OS X."
  Fix crash in ParentAnimation.
  Minor declarative webview tweaks
  Removed dependency of QDeclarativeWebView to private Qt (Declarative) API
  Note that you need to unset a flag to create a visual item
  Follow-up on Flickable changes.
  ListModel::get() should return undefined if bad index specified
  Add an example spinner.
  Fix crash on remote content.
  Dates and variants are not considered nested objects

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
index d76b582..c87171b 100644
--- a/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
+++ b/tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro
@@ -4,8 +4,14 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativevisualdatamodel.cpp
 
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
+symbian: {
+    DEFINES += SRCDIR=\".\"
+    importFiles.sources = data
+    importFiles.path = 
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
 
 CONFIG += parallel_test