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

Conflicts:
	.qmake.conf

Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d

diff --cc src/androiddeployqt/main.cpp
Simple merge

diff --cc src/assistant/assistant/assistant.pro
Simple merge

diff --cc src/assistant/assistant/main.cpp
Simple merge

diff --cc src/qdbus/qdbusviewer/qdbusviewer.cpp
Simple merge

diff --cc src/windeployqt/main.cpp
Simple merge