user avatar
Merge remote-tracking branch 'origin/5.9' into dev
Liang Qi authored
Conflicts:
	.qmake.conf
	src/virtualkeyboard/virtualkeyboard.pro

Change-Id: Idf7682b63379b94a1d444d3528472afea77133bc
7036de7b
Name Last commit Last update