Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iaa0684017736c6a5ec387a201add89fc351adfe2
Update module version to 5.2.0

Change-Id: I310777c1005de28da1eb6326fec03ebb7716919a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5e1eb924132b9f1a032886d3b6c0e16bcc623fa9
lupdate: allow to configure names of tr()-like functions

This makes it possible to use lupdate in projects that would like to
wrap the tr()-like functions with their own versions, e.g. to add
error checking or other instrumentation code.

While we're at it, also simplify the c++ parsing with partly
table-driven code.

Change-Id: I72af68afa851a46342e75dcdd3dd58f4c14276b8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I4556ce5965020154a563cef9613305cafae3c674
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: Ib2c94071cee5846db9b16ee4d3e9aeb897e9070e
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic056eeec62fbbbf5c932d8e862736f368833f34d
Doc: Setting navigation variables for tools and tool manuals.

-for the navigation bar.

Change-Id: I151739bd5f5a3473e03699465cf7edeaae8b3a82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8ced3d911cec321949dd8b160447792ef9bbd3c3
Use QT_HOST_DATA/src to get to the mkspecs.

QT_HOST_DATA/get changed semantic on the dev branch.

Change-Id: I2b190ce011a91144eb8b1731fa58d71d64cd6b17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Update Info.plist files for new Cocoa main() call pattern

We would get the following error message otherwise, 'No Info.plist
file in application bundle or no NSPrincipalClass in the Info.plist
file, exiting.'

Needed by I790e5138c29aac2e0215a9147d0148fece40ca22.

Change-Id: I8d2301c41e4957195be8ed5da9a55ab5b02c4608
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I7ca374a1c97a80238af7d6471626ec8db94a5990
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5368a3b3212af59ac5b95bc56c667b0d3392078a
adjust to qHash(QString) returning a full int's worth of bits in qt5

Change-Id: I3f9357a2affa63cc50c6fc20b61d7ea4323a6cfb
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
avoid infinite loop on unterminated bracketed expressions

Change-Id: I9469608e1b9ce1d345c4011982b19814ebd39b53
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
ignore bracketed expressions only outside function scope

static initializers obviously cannot appear in scopes, so there is no
reason to suppress parsing tr() statements used for indexing inside
functions.

Task-number: QTBUG-29998
Change-Id: I3a0330e1382cd5a74106328ae6722a02af282f7f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
make QT_TR_NOOP work in static initializers, take 2

simply ignoring equal signs turns out to be not so smart: there are
static initializers without braces, which consequently do not look like
function definitions with a weird additional char.

Task-number: QTBUG-9276
Change-Id: I7d200aee7b81f17b42866eca4830be388c8edb64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
clear prospectiveContext after "consuming" it

otherwise it would trigger useless assignments later on.

Change-Id: I8af23747c8f1abcadc3fd86810093303db65117e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
fix handling of c'tors with namespaced parent classes

this is achieved by setting yyTokColonSeen under much narrower
conditions (when we are pretty sure that we are seeing the start of a
c'tor's initializer list), which allows us to unset it under much
narrower conditions (when we are pretty sure we are seeing the start of
the c'tor's body), so we now actually *do* skip over qualifications
which would confuse us.

Change-Id: Ic04bad57a08cc66d41094775570d25e7288e6324
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Doc: Set the \module pages' \qtvariable.

-Tells QDoc the module's QT variable value

Change-Id: I91cbaa6eb75ea181dc1b049d92a8acd97cbf1344
Reviewed-by: Martin Smith <martin.smith@digia.com>