Make developer comment copyable for clipboard

Make developer comment text copyable even when not editable. This
will make it behave just like source text does during clipboard copy.

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

windeployqt: Add options to override debug/release detection.

Task-number: QTBUG-36347

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

whitespace fixes

remove trailing spaces & expand tabs

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

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

Conflicts:
.qmake.conf

Change-Id: I44d12139aef2988cf7ec6c22129f105b597b6d54

Bump MODULE_VERSION to 5.2.2

Change-Id: I4630da5ae21133dd72d27d4354ed165116b26675
Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>

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>

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>

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)

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)

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>

windeployqt: Support delay-load linked DLLs.

Task-number: QTBUG-35810
Change-Id: I10f5ff742d5abe0185c8046f2a4e473740611231
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>

windeployqt: Fix help formatting.

Bluetooth is the first module.

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

windeployqt: Use standard streams.

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

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

Change-Id: I0ddb08a2fff6bd0da01e14726f2789741b509e76

add "Clear" to context menu of log viewer in qdbusviewer

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

assign a shortcut key to the Quit action in qdbusviewer

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

Assistant: Introduce a 'compact' display for the simple search

Setting the mode disables the Previous and Next buttons for the simple
search history. This is meant to be used e.g. in Qt Creator where the
horizontal space in the side bar is precious.

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

windeployqt: add a -dry-run option to simulate deployment

For some use cases, only output (not deployment) may be required. This
adds an option to only simulate deployment, without copying any files.

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

don't pretend that the tr functions are language tokens

this avoids misparsing in a few contexts where a respective identifier
was not meant to be a tr()/etc. function call (e.g., class/namespace),
and it's more efficient, because we don't try to map every single word
to a function token any more.

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

dissolve getMacroArgs() function

the replacement is less efficient, but also less obscure and more
robust.

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

don't reset yyWord right away

there is no point in doing that - all tokens that actually "fill" the
word, calculate the size "from scratch" anyway.
not resetting it potentially allows us to use the word after reading
further tokens. though comments between the tokens would mess things up
...

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

factor Tok_tr* handlers into functions

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

reserve space for joined string in stringifyNamespace()

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

don't convert unresolved namespace parts to a string list

instead, convert it into the final string directly.

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

prefer stable reference into container

this currently does not matter, as we are using a container which
allocates each element separately, but this may change at some point.
also, it's just cleaner this way.

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

use NamespaceList more consistently

as we use HashString for the segments in *qualify*(), we should use the
respective typedef'd container.

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

don't create temporary string lists and concatenate them

this is most certainly slower than creating (short) temporary strings
and concatenating them.

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

remove dead code

there is no use for a "default context" any more.

amends 17af244af.

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

make function alias manager QString-based

the parsers are all QString-based, so using byte arrays just slows down
things unnecessarily.

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

stricter enum typing

helps with debugging, and is just better.

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

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

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

Change-Id: I5722759d15676448eb976bfbd908d9cd5eb2650f

windeployqt: Add a list mode which is suitable for an Appx mapping file

This is useful for creating Appx packages of WinRT projects.

Task-number: QTBUG-35599

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

windeployqt: Add output options for simple lists

Some tools, such as MSBuild, can't parse JSON easily. This change adds
a "list" option, which changes the output to list the deployed files, one
per line. The user can view the source, target, or relative target files
by passing -line <source|target|relative> to windeployqt.

Task-number: QTBUG-35328

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

Print adb commands in verbose mode.

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

Remove old qt libs if the qt installation folder is different.

Store and check the Qt instalattion folder.

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

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

Change-Id: I788baca1c05b6293c295f7842347bf0100d9d48c

androiddeployqt: Speed up debug deployment

Debug deployment had a major flaw which made it slower than
just bundling the libraries. For every deployment it would
recursively extract the timestamp of all files from the
remote tmp/ directory. This took about 20 seconds.

I've made some improvements:
1. Just use a single modification.txt file which is updated for every
deployment and only update Qt files that have changed since the last
deployment.

2. Deploy all Qt files in debug deployment instead of just the
dependencies of the app, to make it possible to add dependencies to
the app at a later time without clearing the remote cache.

3. Instead of doing an adb push call for each file, we now just do one
big push after building the local temporary directory.

4. I added a timing mechanism to make it simpler to debug problems
related to this.

Task-number: QTBUG-35401
[ChangeLog][androiddeployqt][QTBUG-35401] Speed up debug deployment.

Change-Id: Ida94c73fc48a0a627203398a86732a94baff1451
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

Better error message if dbus libs unavailable

If the D-Bus libraries cannot be loaded, the DBusConnection would
have a null d-pointer, thus have no QDBusError.

Change-Id: Ibeca6eae84c84c886c173817c9c83e76d45346a0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

windeployqt: Fix deployment of the D3D compilers.

Don't deploy system D3D compilers on Windows Phone and
introduce option to turn it off.

Deploy d3dcompiler_qt for Qt versions >= 5.3 should it exist.

Add code to determine the Qt version number (for which qmake does
not write a newline character).

Task-number: QTBUG-35597

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

Qt Designer: Clear undo stack when reloading form.

Task-number: QTCREATORBUG-11119
Change-Id: I4ad9a4ac16f17fec292264896b82f881a4ca5a7d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

windeployqt: Copy .qml files as well.

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

windeployqt: Copy QML directory structure correctly.

Introduce a Module struct to QmlImportScanResult from which
the relative/absolute install path can be derived (similar
to macdeployqt).

Task-number: QTBUG-35638

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

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>

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

Change-Id: I9d12d13a40f0514410dc5e660cabd89152cfc6c6

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>

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

Change-Id: Idd4115a252a1bde50b6f47ec9eba8710dec0d5fb

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>

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

Conflicts:
.qmake.conf

Change-Id: I8d55441489d74fdf75f140efcb6e09f77ada2082

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>

Linguist: Add "Skip obsolete" option to Find dialog.

When "Skip obsolete" option in Find dialog is checked,
linguist searches only no-obsoleted messages.

Change-Id: I0bee0bcc3a8e651bb2a5d1167f25f35d262da347
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>

Designer: remove dead code in QStackedWidgetPreviewEventFilter::updateButtonToolTip()

The local variable 'className' is no longer used, since at some point
in time, it was replaced with the query stackedClassName(), a file-
static function.

So remove the code that sets it.

Change-Id: Ic69ecdf3e58aa954bb348838fbbd64c39974a3c8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>