Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	examples/webkit/imageanalyzer/imageanalyzer.h
	examples/webkit/imageanalyzer/mainwindow.h
	mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
	src/corelib/io/qfsfileengine_iterator_unix.cpp
	src/corelib/io/qfsfileengine_iterator_win.cpp
	src/corelib/kernel/qcoreapplication.cpp
	src/network/access/qnetworkaccessdatabackend.cpp
	src/plugins/bearer/connman/qconnmanservice_linux.cpp
	src/plugins/platforms/openvglite/qwindowsurface_vglite.h
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/s60installs.pro
	tools/assistant/tools/assistant/helpviewer_qwv.h
	tools/qdoc3/test/qt-html-templates.qdocconf

10 files changed, 18 insertions, 15 deletions

diff --git a/tests/auto/qtipc/lackey/main.cpp b/tests/auto/qtipc/lackey/main.cpp
index fef8d22..fbd9bbf 100644
--- a/tests/auto/qtipc/lackey/main.cpp
+++ b/tests/auto/qtipc/lackey/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
index ea906b7..c388a17 100644
--- a/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
index 4ead748..839809e 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
index 7cd6b89..b42fb13 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
index 7995a91..537aebb 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
index 525aa78..6db84dd 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
index ac97100..f6803f7 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
+++ b/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index 18a0cb0..be6049b 100644
--- a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -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
@@ -640,6 +640,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;
@@ -661,10 +665,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 bb319ee..e05b6b8 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.files = ../lackey/lackey.exe
 lackey.path = /sys/bin
 DEPLOYMENT += lackey
+
+# PowerMgmt capability needed to kill lackey process
+TARGET.CAPABILITY = PowerMgmt
 }
 
diff --git a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
index cb3bb6b..5cc283b 100644
--- a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **