Eike Ziller fcb12a275f Merge remote-tracking branch 'origin/4.10' into 4.11 ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/projectexplorer/deploymentdata.cpp
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: I64c304fc71435629a6a0060a9df71e8952699508

2019-10-16 15:27:22 +02:00

54 KiB

Raw Blame History

View Raw