Merge remote-tracking branch 'gerrit/master' into containers

Conflicts:
	src/corelib/tools/qstring.cpp

Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb

1 files changed, 0 insertions, 32 deletions

diff --git a/util/s60pixelmetrics/pm_mapper.pkg b/util/s60pixelmetrics/pm_mapper.pkg
deleted file mode 100644
index 97a689ed70..0000000000
--- a/util/s60pixelmetrics/pm_mapper.pkg
+++ /dev/null
@@ -1,32 +0,0 @@
-; ==============================================================================
-;  Name        : PMMapper.pkg
-;  Part of     : Pixel Metrics Mapper
-;  Description : Package file for pixel metrics mapper
-;                SIS creation.
-;  Version     :
-;
-;  Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-;  This material, including documentation and any related
-;  computer programs, is protected by copyright controlled by
-;  Nokia Corporation. All rights are reserved. Copying,
-;  including reproducing, storing, adapting or translating, any
-;  or all of this material requires the prior written consent of
-;  Nokia Corporation. This material also contains confidential
-;  information which may not be disclosed to others without the
-;  prior written consent of Nokia Corporation.
-; ==============================================================================
-
-
-;Header
-#{"PMMapper"},(0x2002121F),1,0,0
-
-;Localised Vendor name
-%{"Nokia Test EN"}
-
-;Unique Vendor name
-:"Vendor"
-
-;Files to install
-"\Epoc32\release\armv5\urel\pm_mapper.exe"                   -"!:\sys\bin\pm_mapper.exe"
-"\epoc32\data\z\private\10003a3f\apps\pm_mapper_reg.rsc"     -"!:\private\10003a3f\import\apps\pm_mapper_reg.rsc"
-"\epoc32\data\Z\Resource\Apps\pm_mapper.RSC"                 -"!:\resource\apps\pm_mapper.rsc"