Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4

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

Tue, 26 Aug 2014 07:51:49 +0000 (09:51 +0200)

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

Tue, 26 Aug 2014 09:21:16 +0000 (11:21 +0200)
author Simon Hausmann <simon.hausmann@digia.com>
Tue, 26 Aug 2014 07:51:49 +0000 (09:51 +0200)
committer The Qt Project <gerrit-noreply@qt-project.org>
Tue, 26 Aug 2014 09:21:16 +0000 (11:21 +0200)
diff --cc tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Simple merge
author	Simon Hausmann <simon.hausmann@digia.com>
	Tue, 26 Aug 2014 07:51:49 +0000 (09:51 +0200)
committer	The Qt Project <gerrit-noreply@qt-project.org>
	Tue, 26 Aug 2014 09:21:16 +0000 (11:21 +0200)