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
Add deployment documentation for translations.

Task-number: QTBUG-28766

Change-Id: Ibc1b71fde39d344167f7dcecba81e2618c3e4e97
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Fix CLANG-warning about unused variable q_ptr.

Change-Id: Ife2e8d38059dfff33f544587f8a8b6f6c8bc2a8b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Bump MODULE_VERSION to 5.1.2

Change-Id: Ie2ab17222cb7f8b3d4047aa08fed1b8f74a89df4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Fix compilation when QT_NO_PRINTDIALOG is defined

Seems like QT_NO_PRINTER does not imply QT_NO_PRINTDIALOG,
so both need to be checked.

Change-Id: I164e602e75ebb524a33cfacaad68023e33f8978f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I4ad3ca66f63476974bdfcadcff373179715a34d2
Move uiloader test from tests/auto to tests/manual

 - bring tst_screenshot test back
 - make tst_screenshot compile
 - make tst_uiloader compile

Change-Id: I12b584e834a5942699644637cce6071f0de58654
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Linguist: Set windowTitle in form preview.

Task-number: QTBUG-26868
Change-Id: I065d17cbf3c4426f3ba95b8c8f999f181af4b062
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>