Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration

* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits)
  Fix warnings, whitespace cleanup
  Don't rely on uninitialized data
  Doc: Fixing typo
  Doc: Fixing typo
  Skip failing tests
  Use effective user id instead of getlogin
  Fix compile error in tst_qfileinfo on Mac/Linux
  Fix tst_QFileInfo owner() & group() failure on Windows.
  Fix tst_QFileInfo::canonicalFilePath failure on Windows
  Fix QDir::relativeFilePath
  Fix spelling in comments
  Add missing license header to test case
  Define _WIN32_WINNT before any includes
  New attempt at fixing compilation failure
  Removing unused duplicate definitions
  No symbolic links in Windows CE
  Set minimum target Windows version to 2000
  More missing includes
  Add missing include
  Fix compile error
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
index a93f7af..ed9313f 100644
--- a/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
+++ b/tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro
@@ -8,7 +8,7 @@ SOURCES += tst_qdeclarativemousearea.cpp ../shared/testhttpserver.cpp
 symbian: {
     importFiles.files = data
     importFiles.path = .
-    DEPLOYMENT = importFiles
+    DEPLOYMENT += importFiles
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }