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: (218 commits)
  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
  Update def files
  Fix tst_QFile::caseSensitivity test on Mac
  Fix typo in QFile test
  Add test generated files to .gitignore
  Fix compile error for qdir autotest on symbian3
  QtDeclarative: make autotests compile on symbian
  ...

2 files changed, 13 insertions, 4 deletions

diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 0a49fbe..608d876 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -48,6 +48,10 @@ HEADERS  = configureapp.h environment.h tools.h\
            $$QT_SOURCE_TREE/src/corelib/io/qdiriterator.h \
            $$QT_SOURCE_TREE/src/corelib/io/qfile.h \
            $$QT_SOURCE_TREE/src/corelib/io/qfileinfo.h \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystementry_p.h \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine_p.h \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemmetadata_p.h \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemiterator_p.h \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine.h \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator_p.h \
            $$QT_SOURCE_TREE/src/corelib/io/qiodevice.h \
@@ -86,9 +90,13 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfile.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfileinfo.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qabstractfileengine.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystementry.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine_win.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemiterator_win.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator_win.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qiodevice.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qtextstream.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.cpp \
@@ -115,8 +123,6 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \
            $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp
 
-win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp
-
 DEFINES += COMMERCIAL_VERSION
 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/corelib/arch/generic \
diff --git a/tools/qtestlib/wince/cetest/bootstrapped.pri b/tools/qtestlib/wince/cetest/bootstrapped.pri
index b9c4b2b..56c8ab7 100644
--- a/tools/qtestlib/wince/cetest/bootstrapped.pri
+++ b/tools/qtestlib/wince/cetest/bootstrapped.pri
@@ -4,11 +4,14 @@ SOURCES += \
            $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfile.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qdir.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystementry.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemengine_win.cpp \
+           $$QT_SOURCE_TREE/src/corelib/io/qfilesystemiterator_win.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qabstractfileengine.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator.cpp \
-           $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_iterator_win.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qfileinfo.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qdiriterator.cpp \