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

Change-Id: Ided10fa5438cc1bd9a34fd8ded4bbd456abfe686
windeployqt: Remove deleted QML directories from Json output.

Rewrite JsonOutput to use a QPair<> of strings and add function to remove
all entries of a target directory.

Task-number: QTBUG-39626
Change-Id: Ie4602deb45d60fdddab27f264ecf34b72f839254
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Merge remote-tracking branch 'origin/stable' into 5.3

Change-Id: I78a250e8631706606e6b003b28cdfb90ad692abc
Allow to build only lrelease + lupdate + lconvert

This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
is built without GUI support (no-png is set) and we still want to build
native lrelease + lupdate + lconvert tools.

Upstream-Status: Pending

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
assistant/help: fix linking of dependent libraries

else we get:
| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'

Upstream-Status: Inappropriate [configuration]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
add noqtwebkit configuration

Upstream-Status: Inappropiate [configuration]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>