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:
  Fix QSharedMemory and QSystemSemaphore autotests for Symbian
  Fix QSystemSemaphore handle management issues in Symbian

2 files changed, 9 insertions, 6 deletions

diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index 5825524..50205bc 100644
--- a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -51,7 +51,7 @@
 #define EXISTING_SIZE 1024
 
 #ifdef Q_OS_SYMBIAN
-#define SRCDIR "c:/data/qsharedmemorytemp/"
+#define SRCDIR "c:/data/qsharedmemorytemp/lackey/"
 #define LACKEYDIR SRCDIR "lackey"
 #elif defined(Q_OS_WINCE)
 #define LACKEYDIR SRCDIR
@@ -624,6 +624,10 @@ public:
         QVERIFY(producer.isAttached());
         char *memory = (char*)producer.data();
         memory[1] = '0';
+#if defined(Q_OS_SYMBIAN)
+        // Sleep a while to ensure that consumers start properly
+        QTest::qSleep(1000);
+#endif
         QTime timer;
         timer.start();
         int i = 0;
@@ -645,10 +649,6 @@ public:
         memory[0] = 'E';
         QVERIFY(producer.unlock());
 
-#if defined(Q_OS_SYMBIAN)
-        // Sleep a while to ensure that consumers start properly
-        QTest::qSleep(1000);
-#endif
     }
 private:
 
diff --git a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
index 8a5f8b2..e21e5df 100644
--- a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
+++ b/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
@@ -1,4 +1,4 @@
-CONFIG += qttest_p4
+load(qttest_p4)
 #QT = core
 
 include(../qsharedmemory/src/src.pri)
@@ -31,5 +31,8 @@ QT += script
 lackey.sources = ../lackey/lackey.exe
 lackey.path = /sys/bin
 DEPLOYMENT += lackey
+
+# PowerMgmt capability needed to kill lackey process
+TARGET.CAPABILITY = PowerMgmt
 }