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

Conflicts:
	demos/declarative/snake/snake.qml
	qmake/generators/symbian/symbiancommon.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/s60installs/s60installs.pro
	tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp

2 files changed, 16 insertions, 12 deletions

diff --git a/util/qlalr/doc/src/qlalr.qdoc b/util/qlalr/doc/src/qlalr.qdoc
index dffef5a..0d5fbb9 100644
--- a/util/qlalr/doc/src/qlalr.qdoc
+++ b/util/qlalr/doc/src/qlalr.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in a
-** written agreement between you and Nokia.
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
 **
 ** GNU Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp
index a88499d..d68a0b0 100644
--- a/util/s60pixelmetrics/pm_mapperapp.cpp
+++ b/util/s60pixelmetrics/pm_mapperapp.cpp
@@ -166,6 +166,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             else
                 bufferPtr.Append(_L("screen."));
             ShowL( *buffer, last );
+            CleanupStack::PopAndDestroy( buffer );
             }
             break;
         case ECmdStatus:
@@ -257,7 +258,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
                 bufferPtr.Append(_L("Orientation cannot be changed."));
                 ShowL( *buffer, last );
                 bufferPtr.Zero();
-                delete buffer;
+                CleanupStack::PopAndDestroy( buffer );
                 break;
                 }
             #endif //__SERIES60_31__
@@ -278,7 +279,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand )
             bufferPtr.Append(_L("Orientation changed."));
             ShowL( *buffer, last );
             bufferPtr.Zero();
-            delete buffer;
+            CleanupStack::PopAndDestroy( buffer );
             break;
             }
         case ECmdStartCalculations:
@@ -787,11 +788,14 @@ void CPixelMetricsMapperAppUi::CreateHeaderFileL() const
         CleanupStack::PopAndDestroy(); //sourceFile
         }
 
-    bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2);
-    bufferPMData = bufferPMData.Left(bufferPMData.Length()-2);
-    textFile.Write(bufferLayoutHdr);
-    textFile.Write(KCRLF);
-    textFile.Write(bufferPMData);
+    if (fileCount > 0)
+        {
+        bufferLayoutHdr = bufferLayoutHdr.Left(bufferLayoutHdr.Length()-2);
+        bufferPMData = bufferPMData.Left(bufferPMData.Length()-2);
+        textFile.Write(bufferLayoutHdr);
+        textFile.Write(KCRLF);
+        textFile.Write(bufferPMData);
+        }
     delete dirList;
 
     CleanupStack::PopAndDestroy(); //file