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
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>
complain about missing sources in id-based messages

i considered making this optional on the basis that the source strings
may be assigned externally, but in that scenario lupdate wouldn't be
used to start with.

Task-number: QTBUG-11843
Change-Id: I3f09db902462b8e94f7a134f6fe950562b300307
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
introduce new message type "vanished"

this state is equivalent to "previously finished, but now obsolete", or
in gettext terms "not fuzzy and obsolete".

this bumps the ts format version to 2.1.

Task-number: QTBUG-12948
Change-Id: I6c89bbfb9b16053b4e1219ec7611cb7a34189d95
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf
	src/linguist/lupdate/cpp.cpp

Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea
Remove unnecessary dependency to qtjsbackend from sync.profile

Change-Id: I48e7799ba86b95e76270b97bc2eecf2c9d36049f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
qtconfig: Update for QFont::removeSubstitutions() renaming in Qt 5

Change-Id: I8c6dce1fad8ce4b4dceb25ccb95b7607ef94286f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
add -pro-debug option: trace .pro evaluation (like qmake -d)

Change-Id: I2f6a3d43fa5e65fb6bfa44c17d833d9b8a30e06a
Reviewed-by: hjk <hjk121@nokiamail.com>