user avatar
Merge remote-tracking branch 'origin/5.3' into 5.4
Frederik Gladhorn authored
Conflicts:
	src/assistant/assistant/mainwindow.cpp
	src/linguist/linguist/mainwindow.cpp
	src/qdbus/qdbusviewer/qdbusviewer.cpp

Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363
e69d4a9f