Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

Conflicts:
	src/corelib/io/qfilesystemwatcher_symbian.cpp
	src/corelib/io/qfilesystemwatcher_symbian_p.h

1 files changed, 13 insertions, 4 deletions

diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index 26e00bd98..368b2a02d 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -1316,6 +1316,15 @@ protected slots:
 
 private:
     int exitCode;
+#ifdef Q_OS_SYMBIAN
+    enum
+    {
+        /**
+         * The maximum stack size.
+         */
+        SymbianStackSize = 0x14000
+    };
+#endif
 };
 
 //-----------------------------------------------------------------------------
@@ -1324,7 +1333,7 @@ void tst_QProcess::processInAThread()
     for (int i = 0; i < 10; ++i) {
         TestThread thread;
 #if defined(Q_OS_SYMBIAN)
-        thread.setStackSize(0x14000);
+        thread.setStackSize(SymbianStackSize);
 #endif
         thread.start();
         QVERIFY(thread.wait(10000));
@@ -1349,9 +1358,9 @@ void tst_QProcess::processesInMultipleThreads()
         thread2.serial = serialCounter++;
         thread3.serial = serialCounter++;
 
-        thread1.setStackSize(0x14000);
-        thread2.setStackSize(0x14000);
-        thread3.setStackSize(0x14000);
+        thread1.setStackSize(SymbianStackSize);
+        thread2.setStackSize(SymbianStackSize);
+        thread3.setStackSize(SymbianStackSize);
 #endif
         thread1.start();
         thread2.start();