Merge remote-tracking branch 'origin/5.4' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 25 May 2015 09:03:48 +0000 (11:03 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 25 May 2015 09:03:48 +0000 (11:03 +0200)
commitb558ecb8f2a701d2c416c46ca806e199411cf5e2
treeb7427b364c3fd2fc912c86e25bbf0017cccd4214
parente0017be47524c12f93ec82849371d1028de738b6
parenta6ed9b418d1b4464f088b378e5bdb96ec420db6c
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf

Change-Id: I47fe486745efad44537255a56087f4ec0a3b2e82
src/linguist/shared/translator.cpp
tests/auto/linguist/lconvert/tst_lconvert.cpp
tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp