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

Conflicts:
	demos/declarative/samegame/SamegameCore/samegame.js
	mkspecs/features/symbian/default_post.prf
	src/declarative/qml/qdeclarativeengine.cpp
	src/gui/text/qtextdocumentlayout.cpp
	src/plugins/plugins.pro
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def
	src/s60installs/s60installs.pro
	tests/auto/declarative/declarative.pro
	tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
	tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
	tests/auto/declarative/qmlvisual/qmlvisual.pro

1 files changed, 60 insertions, 2 deletions

diff --git a/dist/changes-4.7.2 b/dist/changes-4.7.2
index 0d93052..d351856 100644
--- a/dist/changes-4.7.2
+++ b/dist/changes-4.7.2
@@ -134,8 +134,63 @@ Qt for Symbian
      specify which Internet Access Point should be used for streaming.
 
  - QNetworkProxyFactory
-    * [QTBUG-13857] Added systemProxyForQuery() for Symbian, allowing
-      network proxies configured on the device to be used by applications.
+   * [QTBUG-13857] Added systemProxyForQuery() for Symbian, allowing
+     network proxies configured on the device to be used by applications.
+
+ - QApplication
+   * [QTBUG-15915] Fix crash when creating more than one QApplication in single test case.
+
+ - QDesktopWidget
+   * [QTBUG-16095] Resize event for QDesktopWidget was sent too early.
+
+ - QFileDialog
+   * [QTBUG-16204] Fix using QFileDialog statics in Symbian.
+
+ - QDialog
+   * [QTBUG-16277] Fix fullscreen/Maximized dialog misplacement in Symbian.
+
+ - QSystemSemaphore
+   * [QTBUG-16615] Fix QSystemSemaphore handle management issues in Symbian.
+
+ - QLineEdit
+   * [QTBUG-16238] Fix one character displacement for cursor in line edits.
+
+ - qmake & mkspecs
+   * [QT-4193] Only add ICON for application projects in symbianpkgrules.pri
+   * [QTBUG-13159] Allow pkg_prerules and pkg_postrules to be targeted to separate files.
+   * [QTBUG-13367] Make default application deployment removable & added .flags modifier
+      support for DEPLOYMENT items in Symbian.
+   * [QTBUG-14280] Implement support for DEPLOYMENT.display_name in Symbian.
+   * [QTBUG-13917] Localize .loc and .pkg content based on TRANSLATIONS.
+   * [QTBUG-15159] Use include(original mkspec) instead of copying of mkspec to default.
+   * [QTBUG-15393] Resolve EPOCROOT in qt.conf using same logic as in .pro.
+   * [QTBUG-15501] Fix symbian-mmp.conf include path.
+   * [QTBUG-15539] Use parent class function to generate Makefile headers in Symbian.
+   * [QTBUG-14472] Add NetworkServices capability automatically for network apps
+   * [QTBUG-14736] Add libinfix support for QML plugins in Symbian.
+   * [QT-4375] Fix incorrect file name case for OpenGL libraries in symbian.conf.
+   * [QTBUG-16172] Use relative include instead of absolute in default qmake.conf.
+   * [QTBUG-16221] Fix libinfixed usage in Symbian when def files are used.
+   * [QTBUG-16261] Fix infinite loop in qmake when reading malformed .ts files.
+   * [QTBUG-16298] Ignore static_and_shared in Symbian builds.
+   * [QTBUG-13769] Generate freeze targets in Symbian.
+   * [QTBUG-16691] Remove toolcheck from generic clean targets for symbian-sbsv2.
+   * [QT-4476] Fixed UTF-8 application names in device application menu in Symbian.
+   * [QTBUG-16753] Improved QMAKE_POST_LINK support in symbian-sbsv2.
+   * [QTBUG-16881] Fix QMAKE_POST_LINK in Symbian for targets with special characters.
+   * [QTBUG-16888] No longer replace dash and dot in TARGET with underscore in Symbian.
+   * Fix partial upgrade package UID for libinfixed Qt.
+   * Cleaned up sis_targets.prf.
+
+ - Tool scripts
+   * [QTBUG-13886] Disallow patching capabilities of executables.
+   * [QTBUG-13891] Add Location as self signable capability in patch_capabilities.pl.
+   * [QTBUG-15561] Only patch package content that is necessary for self-signing.
+   * Fix epocroot handling in createpackage.pl script.
+   * Unify epocroot usage in createpackage and patch_capabilities scripts.
+
+ - qtmain.lib
+   * [QTBUG-14735] Use qtmain.lib to provide entry point for all Symbian applications.
 
 Qt for Embedded Linux
 ---------------------
@@ -165,6 +220,9 @@ Qt for Windows CE
  - Linguist
    * baz
 
+ - qmake
+   * [QTBUG-14357] Make qmake to pass all UTF-8 characters unchanged through parser.
+
 ****************************************************************************
 * Important Behavior Changes *
 ****************************************************************************