Merge commit 'origin/master'

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/kernel/qmetatype.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/itemviews/qheaderview.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qgesture.h
	src/gui/kernel/qgesturerecognizer.h
	src/gui/painting/qpaintengine_raster.cpp
	src/network/access/qhttpnetworkreply.cpp
	src/network/access/qnetworkcookie.h
	src/network/socket/qnativesocketengine_unix.cpp

1 files changed, 14 insertions, 4 deletions

diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index db221dd34a..c529d3e75f 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -129,7 +129,11 @@ namespace QTest {
 
     static const char *messageType2String(QAbstractTestLogger::MessageTypes type)
     {
+#ifdef Q_OS_WIN
         static bool colored = (!qgetenv("QTEST_COLORED").isEmpty());
+#else
+        static bool colored = ::getenv("QTEST_COLORED");
+#endif
         switch (type) {
         case QAbstractTestLogger::Skip:
             return COLORED_MSG(0, 37, "SKIP   "); //white
@@ -165,10 +169,16 @@ namespace QTest {
         LeaveCriticalSection(&outputCriticalSection);
 #elif defined(Q_OS_SYMBIAN)
         TPtrC8 ptr(reinterpret_cast<const TUint8*>(str));
-        HBufC* hbuffer = HBufC::NewL(ptr.Length());
-        hbuffer->Des().Copy(ptr);
-        RDebug::Print(_L("[QTestLib Message] %S"), hbuffer);
-        delete hbuffer;
+        HBufC* hbuffer = HBufC::New(ptr.Length());
+        if (hbuffer) {
+            hbuffer->Des().Copy(ptr);
+            RDebug::Print(_L("[QTestLib Message] %S"), hbuffer);
+            delete hbuffer;
+        } else {
+            TBuf<256> tmp;
+            tmp.Copy(ptr.Left(Min(256, ptr.Length())));
+            RDebug::Print(_L("[QTestLib Message] %S"), &tmp);
+        }
 #endif
         QAbstractTestLogger::outputString(str);
     }