windeployqt: Fix help formatting.

Bluetooth is the first module.

Change-Id: I69f3dda65c4f98978e7c9232127a7949e7f45e66
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
androiddeployqt: Always overwrite user files

The Android files in the project should always overwrite the
equivalents in the template, even if the template files have
been modified after the project files. Otherwise an old project
could stop working when Qt was updated.

Task-number: QTBUG-35147
[ChangeLog][Android][QTBUG-35147] Make sure Android files in the
project always overwrite the equivalent files in the project
template.

Change-Id: I4c38061501cbcaa1061e376e7b49a1a0efe596cf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
set QMAKE_INTERNAL_INCLUDED_FILES even without PROEVALUATOR_FULL

some qt prfs use this variable, so better set it it to avoid some noise.

Change-Id: I606c88dd7664b1cd8b490d60badd5c6bf80fd1c9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/e64cc71194cbe283dfe9bd2cd688f01fcdcadf34)
don't turn = into += in cumulative mode

it leads to pathological cases where the number of loop iterations may
go way beyond the reasonable.

this means that users need to avoid using the = operator in alternative
branches that lead to different sources/subdirectories being included
into the project. this is a bit of a corner case anyway, as people
usually add directly to SOURCES/SUBDIRS.

Change-Id: I7783e318fbc2790f6a853ba4e3f4a12db881feb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/30bd7fcce1aef974f6af9eaa6532aa1f2b6192d2)
do not look for mkspecs/ directories in project trees

this pretty surprising behavior would interfere with building the
examples from an installed qt tree with qmakes from other qt builds.

.qmake.conf (and .qmake.cache) files provide a possibility to explicitly
"anchor" project roots, so there is no point in having a second, even
more magic way to do it.

Task-number: QTBUG-35485
Change-Id: I8fd4fda67cabafdf55e7a98282dcdfaffb4a405e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
(cherry picked from qtbase/65a676372c533e8b35117081ec0aa1a94e1500e5)
Reviewed-by: hjk <hjk121@nokiamail.com>
Remove conditions that aren't used anymore

QT_EDITION and QT_MODULE_GRAPHICSVIEW aren't used anymore.

Change-Id: I73d78a79ce7ca6bb4ab240d49ac0bd749a9ecdb4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Remove checking of old product that doesn't exist anymore

There's no product called 'console' anymore.

Change-Id: I57e1173de388f3602a392c1a38019ff20179e06a
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Bump MODULE_VERSION to 5.2.2

Change-Id: I4630da5ae21133dd72d27d4354ed165116b26675
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I93127fc2b9963d0fec1ca7180cfa2c110bf3d27d
androiddeployqt: Support spaces in jarsigner arguments

The input to the jarsigner (specifically the password, alias,
file name, etc.) can contain spaces, so the arguments need
to be quoted.

[ChangeLog][Android][androiddeployqt] Fixed signing packages
using arguments containing spaces.

Task-number: QTBUG-36327
Change-Id: Ie673ab91da4ffe074851a6ddef96efbb7657636b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
make the MinGW build of lupdate work for non-admin users

Windows User Access Control thinks that lupdate is an installer,
because of the string "update" in the executable name.
MSVC automatically creates and embeds a manifest into the executable
to state that lupdate doesn't need admin rights.
For MinGW we now embed a handcrafted manifest.

[ChangeLog][lupdate] Fixed lupdate requiring admin rights when built
with MinGW.

Task-number: QTBUG-36369
Change-Id: I306ba4c13014f2e39fc5785bb90bacd951726ad4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Assistant: Load all applicationIcon pixmaps.

Qt Assistant, when used as a custom help viewer, would not load all
sizes of the application icon specified in the .qhcp file. Now
application icons look good everywhere, provided the files contain
multiple icons of various sizes.

Task-number: QTBUG-28267

Change-Id: I362e2feafa7944b0ad25627fb2fcea1b90af4e53
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6d8fce7daab4dcfc9ffc93543dd0a1337a3f3c9d