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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Revert "Make s60main static lib not depend on QtCore"
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp
index ba18bbb..c8c835f 100644
--- a/tests/auto/qdir/tst_qdir.cpp
+++ b/tests/auto/qdir/tst_qdir.cpp
@@ -1470,9 +1470,16 @@ void tst_QDir::updateFileLists()
 
     QDir dir("update-file-lists");
 
+#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE)
+    //no . and .. on these OS.
+    QCOMPARE(dir.count(), uint(4));
+    QCOMPARE(dir.entryList().size(), 4);
+    QCOMPARE(dir.entryInfoList().size(), 4);
+#else
     QCOMPARE(dir.count(), uint(6));
     QCOMPARE(dir.entryList().size(), 6);
     QCOMPARE(dir.entryInfoList().size(), 6);
+#endif
 
     dir.setFilter(QDir::AllEntries | QDir::NoDotAndDotDot);