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

Task-number: QTBUG-34916
Change-Id: Ic67671f03deface209a5f0fa67cbf06b5f4b7f38
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ief9594bded2d96bdd3fc6b0e033df4511181bf7c
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>
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>
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>
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>
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>
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>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I866aa4b65d19c49eca0df97db93dd2833a134d08
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>
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>
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>
Remove unused variable.

Change-Id: I96ed669e25e0ba1123dc313729e666df172bc3c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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>
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>
windeployqt: Ignore empty paths returned by qmlimportscanner.

Change-Id: If8d3964f82ff1ca92aa9d1df05bd4573261401fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
windeployqt: Change command line option for QtHelp module to qthelp.

Change-Id: Ie49a0139cde27fb384fce6320240c9eec3a1372f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ife41f7baf8113951233186f106cdc9c1b2e2bc55
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 "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable