Merge remote-tracking branch 'origin/2.5' into 2.6

Conflicts:
	src/plugins/coreplugin/progressmanager/progressmanager_win.cpp

Change-Id: I7c5168894bd202f9fec8fd3278fad8c3b4f4449c

dist/changes-2.5.2

+Qt Creator version 2.5.2 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v2.5.1...v2.5.2
+
+Platform Specific
+
+Windows
+   * Fixed resource leak leading to regular crashes (QTCREATORBUG-7385)