Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

author Simon Hausmann <simon.hausmann@theqtcompany.com>

Thu, 27 Aug 2015 20:20:34 +0000 (20:20 +0000)

committer The Qt Project <gerrit-noreply@qt-project.org>

Thu, 27 Aug 2015 22:29:28 +0000 (22:29 +0000)
author Simon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 27 Aug 2015 20:20:34 +0000 (20:20 +0000)
committer The Qt Project <gerrit-noreply@qt-project.org>
Thu, 27 Aug 2015 22:29:28 +0000 (22:29 +0000)
diff --cc src/corelib/global/qnamespace.qdoc
Simple merge
diff --cc src/widgets/kernel/qapplication.cpp
Simple merge
author	Simon Hausmann <simon.hausmann@theqtcompany.com>
	Thu, 27 Aug 2015 20:20:34 +0000 (20:20 +0000)
committer	The Qt Project <gerrit-noreply@qt-project.org>
	Thu, 27 Aug 2015 22:29:28 +0000 (22:29 +0000)
		1	2
src/corelib/global/qnamespace.qdoc	patch \|	diff1 \|	diff2 \|	blob \| history
src/widgets/kernel/qapplication.cpp	patch \|	diff1 \|	diff2 \|	blob \| history