Fix typo in macchangeqt help.

Task-number: QTBUG-34783

Change-Id: I8f6ff878e900f9684c5dd595fbc720d0a7d82330
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

windeployqt: Fix scanning of QML-plugins.

Task-number: QTBUG-35637

Change-Id: I0f5a3df3b9be83f3d153135bbca168bfc9005696
Reviewed-by: Andrew Knight <andrew.knight@digia.com>

Make mailto links when used inside the documentation

[ChangeLog][Qt Assistant][Make mailto links work again in Qt Assistant]

Change-Id: Iec15c27bbced7848c800193723399b4e4abc11b9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

windeployqt: Fix operators in additional options check.

Task-number: QTBUG-35612

Change-Id: Ib264aeef926b9a6058ba3e2046c3dc363e13584f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

windeployqt: Concatenate qmlimportscanner results.

Fix up f5b851f83cfb315bbc87ef878bde0b2573f225cf introducing
multiple values for the -qmldir option.

Change-Id: Ib199105776d42b6eaa81003ed5682b2272a19a53
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

windeployqt: Automatically add some dependencies.

Automatically add Qt5Qml when passing the command line option -quick,
thus triggering qmlimportscanner. Similar, add Qt5CLucene and Qt5Designer
when Qt5Help or Qt5DesignerComponents are enabled on the command line.

Change-Id: Ie9a51a51581fc4cf855b53bcfd5d526f30ee93a2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

windeployqt: Add module Qt5CLucene.

Change-Id: I2c5f1f18d8736ce91f9c1a92b662562766dd8171
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

windeployqt: Change option -qmldir to accept multiple values.

When deploying large applications like Qt Creator, it is then possible
to restrict scanning by qmlimportscanner to the modules that actually
use Quick2.

Change-Id: I39d138d5f67a56b251e27c9b48b4ccee020b97aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

Change-Id: Ife41f7baf8113951233186f106cdc9c1b2e2bc55

windeployqt: Change command line option for QtHelp module to qthelp.

Change-Id: Ie49a0139cde27fb384fce6320240c9eec3a1372f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

windeployqt: Ignore empty paths returned by qmlimportscanner.

Change-Id: If8d3964f82ff1ca92aa9d1df05bd4573261401fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

windeplopyqt: Run qmlimportscanner from current directory.

Otherwise, passing relative paths to the -qmldir option does not work.

Change-Id: I4cff5a0e1ef7a2bcfa82558bb1898361f77f3014
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Make getChar() return int

All the calls to this function are:
  yyCh = getChar();

and yyCh is an int. This solves a sign-change warning found by ICC:
cpp.cpp(427): warning #68: integer conversion resulted in a change of sign

Change-Id: I1fe00005ab5095316b49fb0a0b71bbb60141a57e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Remove unused variable.

Change-Id: I96ed669e25e0ba1123dc313729e666df172bc3c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Improve error messages when qhp files are messed up

Hopefully this saves me and everyone time when mixing up project names
resulting in empty namespaces in .qhp projects.

Change-Id: Ib4151225011c866219504c1fdbaadd17d387500a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

Revert "Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin.""

This reverts commit f7f37e7fa2d98f777cc7b6035bb6ff924c75e1fa.

The crash reocurred, disable the QDeclarativeView plugin again.

Task-number: QTCREATORBUG-10273
Task-number: QTBUG-35006

Change-Id: I20406066e0752c6410223ca34abecda8d9b020f6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

androiddeployqt: Add OpenGL dependency to manifest if necessary

In order to filter out devices that do not support OpenGLES 2 in
Google Play, we need to report that we depend on it when using
Qt Quick or Qt OpenGL. It would have been more generic to add the
information to the meta-data in the module, but since we already
have the information there, just in the form of forcing the
use of the GL plugin, we might as well use that and not complicate
the dependency XMLs any further.

Task-number: QTBUG-32491
Change-Id: I2af044be010fcd0a8076906de6385701041b9c01
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Support a number of useful media keys in kmap2qmap

Change-Id: Iacc2e3c8d4fa5e638da6f01e224aaefe42ff700c
Done-with: Andrew den Exter <andrew.den.exter@jollamobile.com>
Done-with: Vesa Halttunen <vesa.halttunen@jollamobile.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

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

Change-Id: I866aa4b65d19c49eca0df97db93dd2833a134d08

add 5.2 changelog

Change-Id: Ia2402e40c457270ef6008ea15684a96109329c5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

stop interpreting Tr() and TR() as aliases for tr()

it's completely braindead to do that - qt has no such functions, and the
behavior was undocumented, producing highly unexpected results.

if somebody actually needs that behavior, he can explicitly define
aliases nowadays.

Change-Id: I0afd02b190397b94ec127b6805fd2c593c2766d6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

disabuse translation system

the apparently attempted context renaming cannot work this way - while
the code would see the renamed context, lupdate would be oblivious of
that, and consequently the translations would not fit.

additionally, lupdate won't recognize the TR() alias at all any more.

Change-Id: I47baeb55a85a59b3c261153ed0c1e17726ffd284
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Doc: Fix issues in Qt Help documentation

Fix following issues:
    - Outdated usage instructions on index page
    - Missing C++ class inheritance information
      caused by missing dependency to qtwidgets
    - Broken \snippet in 'Generating Qt Help'

Task-number: QTBUG-34897
Change-Id: I53dd0fbf41e1dfcd41e11f1ab19db7069839477a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Revert "Qt Designer: Temporarily disable loading of QDeclarativeView plugin."

This reverts commit 8334921061a3e4cfc5ce08e5a837564d40f70714.

The issue has been fixed in Qt.

Task-number: QTCREATORBUG-10273
Task-number: QTBUG-35006
Change-Id: I8891e5c7821f89e9a83442685b2833fa6a0de10e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

Fix Assistant crash with operational words.

Phrase queries with a single term are not allow in clucene,
so once we encounter a search string like "and Next", which
in turn will result in a single word, we use a term query.

Task-number: QTBUG-34973

Change-Id: I9328abf0e96428577cdee15b1671393074cc91c2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

normalize numerus forms upon saving ts files

while linguist itself normalized the display, it would write out the
translation units as-is. this may be a problem for 3rd party tools and
manual editing.

the command line tools already do this normalization.

Task-number: QTBUG-35094
Change-Id: Ia309b07f31051c33adddeef519cff6d9b9a30a69
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Bump MODULE_VERSION to 5.2.1

Change-Id: Ie1b6620a0f238effb7f25083ab10aaa78ce7dfc4
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

QUiLoader: Provide operators for streaming QUiTranslatableStringValue.

When trying to encode mime data in startDrag(), the code
hits the internal item data storing the untranslated text
attached by QUiLoader and triggers an assert as they cannot be
serialized to QDataStream. Add the missing operators.

Task-number: QTBUG-34859
Change-Id: I87a0f59fb42772bf08039915bc7418940ca5a80f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Use qmlimportscanner in windeployqt.

Run qmlimportscanner to find the QML modules and scan their
plugins for additional dependencies.

Change-Id: Ia35e71441c4b97be0561b42fee21e8e6e961d1e5
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

Change-Id: Ief9594bded2d96bdd3fc6b0e033df4511181bf7c

rewrite support for listing translation files as sources

ts files listed among the sources now contribute extant source strings
with locations, i.e., they are treated like all other sources. this
basically makes it possible to use lupdate like gettext's msgmerge.
this enables us to write a much more efficient variant of the
split-qt-ts.pl script found in qttranslations.

the original functionality of adding ts files as providers of
additional translations to merge is hidden behind the new -xts flag; it
is of course still undocumented.

Change-Id: I7a5488d814f39d6b5e9053a414547a6b1461fc14
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Qt Designer: Fix scrolling of widget box.

Task-number: QTBUG-34953
Task-number: QTBUG-7232
Change-Id: If4566c407d4c095ab3dc91d08e058d37af811745
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Assistant/remote control: Use int for return of getc().

Task-number: QTBUG-34916
Change-Id: Ic67671f03deface209a5f0fa67cbf06b5f4b7f38
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

initialize/reset parser context properly

unconsumed context information may persist after finishing processing of
top-level files and includes.
this would confuse the include optimization, which would slow down
lupdate by orders of magnitude for certain inputs.

Task-number: QTBUG-27936
Change-Id: Ifcf6ddd1b54211434ffd8edfbec5e8960ac35f22
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

support a cache that is really just a cache

unlike .qmake.cache & co., the presence of this file has no magic
effects on where mkspecs, modules and other things are searched.

as the obvious name "cache" is of course already taken, we call it
"stash".

the file is searched up to the super cache (if present), otherwise up to
the normal cache/conf (if present), otherwise up to the root.
if it's not found, it is created next to the super cache (if present),
otherwise next to the cache/conf (if present), otherwise in the current
output directory.

note that the cache really should be created and populated by the
top-level project if there are subprojects: otherwise, if there is an
"anchor" (super/cache/conf), subprojects would race for updating the
cache and make a mess. without an "anchor", each subproject would just
create its own cache, kind of defeating its purpose. this is no
different from the existing "cache", but it's worth mentioning that
removing the "anchoring" function does not remove the "nesting order"
constraint.

Task-number: QTBUG-31340
Change-Id: I786d40cef40d14582a0dd4a9407863001bec4c98
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/ff31d87cc883dcf17ab459a15eac04e074d9614a)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>

clean superfile and cachefile paths upon creation

otherwise, if the output dir is the root, the path would be denormalized.

the code for finding existing files already does that.

Change-Id: I56d70477e9c9ffcd936325068624a84df10ffd87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/72075656cfeac570ce002c517a22b1c5d7bc0dd0)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>

move setting of _QMAKE_{SUPER,CONF,CACHE}_ to a more logical location

there is no point in setting the variables already when peeking into
the caches, as that is done in a separate evaluator anyway.
it also makes no sense to have them set while loading the spec itself,
as it's not permitted to do anything with the caches.
so set them at the next convenient point, which is right before actually
loading the caches.

Change-Id: I3717ddf94353dc04e12c52e542f16ed27b578e14
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/0f68222e9ebdf42778d4bb84260268764eb55b30)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>

Make sure .qch file is opened read-only

So far qsqlite tried to open the file first read/write, and falling back
to read access only if this fails. This has resulted in excessively long
loading times e.g. on Windows XP.

Task-number: QTCREATORBUG-10697
Change-Id: I7b1dbddb73feb34491ece5a0765a67354b937f43
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>

androiddeployqt: Fix signing package with -verbose

We would put the "-v" option inside the quotes in the zipalign
command, causing the shell to look for the executable named
"zipalign -v".

Task-number: QTBUG-34588
Change-Id: I88269cada9d77c3ddcceb6133f9bc8cf275c425a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

androiddeployqt: Share information on why plugins are skipped

When we skip a plugin due to missing dependencies, we should
output which dependencies are missing so that people can easily
find out what to add to their .pro files.

Task-number: QTBUG-34586
Change-Id: I64e1687e4ad67165b0d8708e1e1fcedc10883515
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

windeployqt: Move finding shared libraries into a function in utils.

As it is also needed by qmlutils when scanning QML-imports.

Change-Id: Ia9952171e4bab60984562eb0db860751fd54f572
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

androiddeployqt: Support default permissions/features for module

Read the permissions/features required for the module from the
dependency XML and update the default AndroidManifest.xml to
include these.

Task-number: QTBUG-33953
Change-Id: I52edce7ebf826d242fbb49dcd8069c60a1381116
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

Qt Designer: Implement property() for QAxWidgetPropertySheet.

Access the control property of the QAxWidget directly.

Task-number: QTBUG-34592

Change-Id: I7d0971ad8fc265d0443da7ae72330e2b7f3a8d70
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Doc: Updated url variable in qdocconf files.

In 5.2, the HTML output is in a flatter structure and when they are
hosted in qt-project.org/doc, the documentation will be found at
http://qt-project.org/doc/qt-$QT_VER

The url variable is used by projects outside of Qt 5 which need
to link to Qt 5 documentation, such as Qt Creator.

Task-number: QTBUG-34584
Change-Id: Ic0eed7f0d5fbc04544858b8dda3637ea788daac8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Make macdeployqt deploy audio plugins.

Deploy plugins/audio if QtMultimedia.framework is
in use.

Change-Id: I164ddddbf2fbd50c37d42809b5ecdda0ea1d03af
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

androiddeployqt: Put back default app name

When no custom AndroidManifest.xml is specified, we need to
generate a sensible default name like before.

Change-Id: I9411594c43f6d2b3a49686bb6fbab9d999d788c3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

windeployqt: Introduce constants and functions for shared library suffixes.

Change-Id: Ic0792d0935115ab8554288979adabd17ea8cf863
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

windeployqt: Clean up declarations.

Change-Id: I116560a3c10beed9efdc75b240984449f2b6e168
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

windeployqt: Update modules list.

Change-Id: Icfac93eb3cc3858a49043f5dafe32725796adcbc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

androiddeployqt: Make sure generated package name parses

We need to make sure the generated package name does not break
any parser rules in Java. The cleanPackageName() function is
copied from Qt Creator.

Task-number: QTBUG-34245
Change-Id: Ice2f10e25f7f1d93c87c5ced2659e63d386e51a0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Doc: Remove incorrect dependencies

Remove dependencies to nonexistent module 'qtbase'
from .qdocconf files.

Change-Id: If299d764a5c2e0d0d83551f74e30ead70c26aa10
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Remove -quiet parameter, it hides also some errors.

Change-Id: I43dbe412a61d22afe0a01245904785a6cace235d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

qtpaths: Remove duplicate table entries.

Remove DesktopLocation and DocumentsLocation from lookupTableData as they were
wrongly listed twice there.

Change-Id: Ie8b91c294ead114c26857778cf644dbaba181d42
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: David Faure <david.faure@kdab.com>

Remove android specific qmake variables.

Change-Id: I77b0d880abb0a78baf02c2b6be33ca61f9233500
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

windeployqt: Fix matching of modules to take substrings into account.

Qt5WebKitWidgets was not deployed since Qt5WebKit always matched
the library name.

Change-Id: I2bf7268cb2b9db4bf3daf97657c1baf635224e07
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

androiddeployqt: Remove support for QMAKE_SUPPORTED_ORIENTATIONS

This was created for the iOS port and intended to be cross-platform,
but since then they got cold feet and never added the support.
It makes no sense to only support this on Android. We need to
remove it again and hold off until we can find a proper solution.
Editing the AndroidManifest.xml is the non-cross-platform
solution for this.

Task-number: QTBUG-34166
Change-Id: Ide8abb159266bcb2af03667ecf8d92da127960b1
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Fix resetting of string properties.

Task-number: QTBUG-34171
Change-Id: Ib5fe8194d891eb999e41bafde19834be56c84103
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Doc: Rename doc directory of Context Sensitive Help example

During packaging, the doc/ directories are removed from
examples when they are copied to Qt examples install
directory.

This example has a doc/ directory with contents required
to run it. This change renames it so that he packaging
doesn't break it.

Task-number: QTBUG-33848
Change-Id: I7b4e29d7b3c2c2ff9429c1a81bd32fb809d0cdb3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

make setting a bad $$[QMAKEFEATURES] not crash qmake

Task-number: QTBUG-29642
Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7
(cherry picked from qtbase/50a90720be7d67dcdfe704a82fb3b1138edd2aab)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Add JSON parsing support to qmake.

Add qjson* implementation files from corelib/json
to the qmake build. Add a read-only compile mode,
enabled by defining QT_JSON_READONLY.

Add qmake built-in function parseJson(file, into)
which parses a json file into the given variable.

qmake uses a flat key -> value-list implementation
for storing variables, which means that some hackery
is need to represent arbitrarily nested JSON. Use a
special "_KEYS_" variable for arrays and objects:

Arrays:
["item1", "item2"]
$${array._KEYS_} -> 0 1 2
$${array.0} -> "item1"
$${array.1} -> "item2"

Objects:
{ "key1" : "value1", "key2" : "value2" }
$${object._KEYS_} -> key1 key2
$${object.key1} -> value1
$${object.key2} -> value2

Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/89ef515177fd5a0b5d95dcffd5fd0b0669e3625a)
Reviewed-by: hjk <hjk121@nokiamail.com>

qmake: Expose qmake arguments as QMAKE_ARGS

Allows project files or mkspecs to call qmake recursively using system()
with the right arguments, which we use to fix the ios default_post.prf.

Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtbase/1cdbe4752bef972db5471e811e9a781749cd0380)
Reviewed-by: hjk <hjk121@nokiamail.com>

qmake: Update internal mkspec on changes to QMAKESPEC

Allows the macx-xcode mkspec to be a wrapper around other mkspecs.

Since QMAKESPEC can now be set in the spec, we have to ensure not
to append to QMAKESPEC.

Change-Id: Idf33ff38147f14c488f14b426c02d9a739fdaecf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtbase/a9bad65b091d15b0446fa141e0a69ebb94b38b70)

qmake: Evaluate extra configs before loading default_pre

Exclusive builds uses setExtraConfigs to apply the particular CONFIG
of each build pass. Unfortunately we were not applying these extra
configs early enough in QMakeEvaluator::visitProFile() for them to
be picked up/usable by default_pre, something that can be useful.

Change-Id: I423a4688250a15f0c1a2cc65a48f0bbc14ad4497
(cherry picked from qtbase/eea1c359c9663cec15e7373c065ee06cba151eed)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

qmake: Load extra variables only if also loading pre-files

The extra variables only need to be applied once, when we
are loading the pro file (and hence are loding pre files),
not for every single pri/prf that's loaded as a result of that
(which do not load pre files themselves).

Change-Id: I3118694a8eeccf2dc32c4f62df754033fad13528
(cherry picked from qtbase/8e7dc25380dceebca094e092d9feb21ad167ba91)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

qmake: Expose ARGC to qmake functions to be able to check argument count

ARGS already exists, but is a flattened list of the arguments, so both
foo(bar, baz) and foo(bar baz) will give count(ARGS, 2), making it
unreliable for validating arguments to qmake functions.

Change-Id: I0bcc16614c64000169431327da48fd1a26708e67
(cherry picked from qtbase/09205d573413da8a2ac3826198fe36bb2dc4349f)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

qmake: add $$title() function to convert strings to title case

Change-Id: Ic535a8f7cc2ab7b7f1948b2d0237ebe9a71c7ec7
(cherry picked from qtbase/413ec67fc46ad7049f870cdb8ead35149b215d45)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

ProParser: Plug raw data leak

QProcessEnvironment caches keys, so we must not pass it QStrings created with
fromRawData()

Task-number: QTCREATORBUG-9142
Change-Id: I29fade02f3bc4110fafb1b04d44f2e653951a2ae
(cherry picked from qtcreator/99f15f1706868c4b2f84bc4164451bd69b3b8188)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

remove pointless statements

the INCLUDEPATH to the corelib build dir is useless and plain bogus (it
wouldn't work in a modular build anyway).

CONFIG+=console is pointless, because qt_tool does it.

Change-Id: Ifa9a19c7be6a866b26eb980d5b34ab00b3503d49
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

query the presence of the right module

the existence of a -private module does not imply the presence of a
public module any more, so we need to test for qmldevtools-private
explicitly.

Change-Id: Ibd691d758bcaf9c07280bd560521f4947be98f06
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Use stdout for debug output

We need to use the same stream for all debug output, otherwise
they will be shown out of order. Also add some more verbosity.

Change-Id: I66d2e1e67fb6303178a8240815d9faff396f77ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Fix dependency detection corner case

Also skip indirect dependencies from the "bundled" element if
their dependencies are not explicitly included.

Task-number: QTBUG-34285

Change-Id: Iedb726c35d1c979a2ebab551095edcf4ce5cb3a1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Fix deploy mechanism.

The order of "android:value" and "android:name" attributes can be changed when
saving the XML document. Use placeholders instead.

Change-Id: I32e7bf0c91565f5e219d16f549cf1c6583398df0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Move untranslatable stings to AndroidManifest.xml

strings.xml file is used to store strings that can/should be internationalized.

Change-Id: Ib55eff12c905dc09384832ce8ce6865903f60a66
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Smarter plugins resolver.

Don't copy plugins with unmet dependencies.

Change-Id: I6e84166fac5e5553bf3d5b87982eba8255160ae7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Move JSON handling into utils

This allows for every copied file to get added to the JSON output.

Change-Id: I588c173056d359d514e2c1715837b5ce4bf71cb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Android: Remove non-host tools

Command line applications for target architecture does not work on
Android, since apps there are Java applications which call into a
shared library. Thus, these command line tools which are not built for
host architecture are not usable in a SUBDIRS build. They need to be
built and deployed separately in apk packages.

Change-Id: Ia7322ee143a1b73ac40459f078e9f51a4e29a3ab
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Fix handling android dependency xml.

Run readAndroidDependencyXml only once for every Qt library.

Task-number: QTBUG-34078

Change-Id: Ifc2c18f23485e2ced20b0ce3f151a21cb1a0069a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

androiddeployqt: Use correct prefix for tools on x86

When building for x86, the prefix for the tools is not equal
to the prefix for the toolchain directory, so we need a separate
option for this.

Task-number: QTBUG-34110
Change-Id: I72d727832dd4a5f11952c84882496f85075cd9cd
Reviewed-by: BogDan Vatra <bogdan@kde.org>

androiddeployqt: fix dependencies of plugins

The dependency resolver is based on a recursive descent of
the dependency tree. Plugins depend on the libraries, so they
have to be handled after the libraries have been resolved.

The simplest solution is to do multiple passes over the unmet
dependencies from the plugin.

Task-number: QTBUG-34078

Change-Id: I02d8d7c86f77f6c23832a6e301567796b412c5aa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Assistant: Update list of modules for 5.2.

Change modules list to a const char * array for easier
maintenance. Add missing qtbluetooth, qtandroidextras,
qtlocation, qtnfc, qtpositioning,
qtsensors, qtquickdialogs, qtwinextras.

Task-number: QTBUG-34072

Change-Id: Idf178e8d3b3f17f488d8c0ec48dbafde5b73ade2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

windeployqt: Fix deployment of command line applications.

Do not return when not finding any matching plugins.

Change-Id: I176633f4089ba03f29977187c828a5070de381b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

correctly resolve INCLUDEPATH relative to current project

Task-number: QTBUG-24587
Change-Id: I1384403e5c5e3313649fa4abb98e7578cae4677b
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

INCLUDEPATH does *not* act as VPATH for HEADERS

Change-Id: Ibbcc5d40d475d88694b527ef9fab6bc75075d97c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

don't look for sources in FORMS3

amends 17af244afa7

Change-Id: Ie718df1bed4e1c78390c1a6e76a99f13f5e4f136
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

don't unnecessarily claim that gui is needed

Change-Id: Ie5d2c0d74f3b47e7f5cf0a3d34b84b382f01f7bd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Keep the copied files as writable

Mac's strip tool doesn't work if the file is read-only. Some of the
libraries we copy might be read-only (like those installed by
HomeBrew) and that would cause stripping to fail.

Change-Id: Ie8caa853a26794ec97ec84354d9f7bb142cce993
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>

androiddeployqt: Don't detect directories as executable files

When looking for an executable on the PATH we would mistakenly
report directories with the same filename (like "ant") as
the correct executable.

Task-number: QTBUG-33907
Change-Id: I7122e6f8da7a3027666e9dfc3040a17c2876e981
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Qt Designer: Temporarily disable loading of QDeclarativeView plugin.

Avoid symbol clashes between QtQuick1 and QtQml.

Task-number: QTCREATORBUG-10273
Change-Id: I84d5b378b9e246d67d8114f701ba5d012cbf5cff
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Macdeployqt: Deploy QML imports.

Use qmlimportscanner from QtDeclarative to find used
imports.

New option:
-qmldir=<path> : Deploy imports used by .qml files
in the given path. (defaults to ".")

Change-Id: I3efa47557a1b5aae0ad838024ba5fe1a98be3b16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

androiddeployqt: make it easier to diagnose problems

Enumerate the enum so we don't have to count the values
each time we need to make sense of the return code.

Change-Id: Ibe168798fb167659688519b2cd833a1894a9deec
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>

Make deployment on Android work again when device is specified

When fixing the case of executable path names with spaces, we
accidentally put an option inside the quotation marks.

Change-Id: Ia3bcf8415d1a936a85fe1b0900d47ffd87daf667
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

add missing file

amends 35139d45

Change-Id: I53a65e9410a7c6bcd3d28c3b4b416d275679436f
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Long live windeployqt!

Add windeployqt for deploying Windows/Windows Runtime applications.

Change-Id: Ia6ca4af13a93fdc75ef6fe4f794cbe228533e85f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>

androiddeployqt: Fix overriding auto-detected deployment

The platform plugin is set as part of the whole autodetection
step. When this step is not run because deployment is explicitly
set in the .pro file,  we should still detect the platform plugin.

The way we do this is by checking which platform plugin is
included in the deployment settings and using this.

Change-Id: I189972a34f03b9059db84bc41855ac662071ca11
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

androideployqt: Allow executable paths with spaces

When the path for an executable contains a space (like when running
jarsigner from "Program Files" on Windows, we need to quote it before
passing it to the shell. We just quote all executables to make it simple.

Change-Id: I1a387c2d846ed0f0ee6aca36b7414b0da827dde3
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

Add QKeySequenceEdit to Qt Designer

Change-Id: I0efe3f58539fef59154d1c07e6c044bb45fe53cf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

Remove QtAlgorithms usage from Qt Assistant.

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I6f02d91289c3f455d8643b145fb2c6477863056c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

Remove QtAlgorithms usage from Qt Designer.

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I2c7057557295a9bbc83b3d7c625b04400d9e6c2a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

Remove QtAlgorithms usage from Qt Linguist and its tools.

QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I3d74510693a5144b536cf515077d870e380d47df
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>