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: (25 commits)
  Fix snake demo
  Add qmlmethod Item::childAt() to delarative item
  Cursor positioning in QTextDocument after undo()
  Fix slow network access in qmlviewer (Windows)
  Don't layout multiple times when an ancestor becomes (in)visible.
  Add an example of animated item add/remove in ListView
  Add test for PropertyChanges with attached properties.
  Make declarative autotests compile on Symbian abld build system
  Accept enter key in the webbrower demo url input.
  Keep reported point/pixel size in sync.
  Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
  Ensure state operations assigned to the default state are triggered
  Add image example.
  Fix regression in input panel autotests
  Improve docs about Qml component case sensitivity.
  Add some performance tips to QML docs.
  Move QListModelInterface into util.
  Ensure ParticleMotionGravity always pulls in the right direction.
  Remove version ifdefs from Particles; only 4.7 is supported.
  Update docs for the runtime.orientation values
  ...

1 files changed, 1 insertions, 3 deletions

diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
index d95165c..398139a 100644
--- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
+++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro
@@ -4,9 +4,7 @@ macx:CONFIG -= app_bundle
 
 SOURCES += tst_qdeclarativetimer.cpp
 
-symbian: {
-    DEFINES += SRCDIR=\".\"
-} else {
+!symbian: {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }