Eike Ziller 4545c81e57 Merge remote-tracking branch 'origin/4.9' ...

Conflicts:
	doc/src/howto/creator-sidebar-views.qdoc
	doc/src/howto/creator-ui.qdoc
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/autotest/testresultmodel.cpp
	src/plugins/autotest/testresultmodel.h

Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd

2019-05-08 12:41:25 +02:00

5.5 KiB

Raw Blame History

View Raw