Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 26 Aug 2014 07:51:49 +0000 (09:51 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 26 Aug 2014 09:21:16 +0000 (11:21 +0200)
commite525c551394ba2827e4494bfb72ff43171e9b7e1
treea7223403990a45bbaf8037600f282c1d01a6e811
parent1075dca1b50926f52daddf099b5f5a9fbb5da6c7
parente9e6f70d355499d551a26960d236644f92ea38af
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp