Eike Ziller f950a5d86c Merge remote-tracking branch 'origin/8.0' ...

Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd

2022-07-07 13:47:12 +02:00

37 KiB

Raw Blame History

View Raw