Eike Ziller 0777b65db3 Merge remote-tracking branch 'origin/5.0' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	src/plugins/android/androidconfigurations.cpp

Change-Id: If8dc2cdf131811e08ca147c6f58dbb3ed3bf7227

2021-08-26 11:09:08 +02:00

30 KiB

Raw Blame History

View Raw