Orgad Shaneh 49f6b0146a Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82

2019-12-07 18:39:54 +02:00

..

FindDesignerComponents.cmake

CMake Build: Fix finding link library for DesignerComponents

2019-09-10 12:21:57 +00:00

FindGoogleBenchmark.cmake

CMake build: Add "Devel" package

2019-07-25 14:06:46 +00:00

FindGoogletest.cmake

CMake build: Add "Devel" package

2019-07-25 14:06:46 +00:00

FindQbs.cmake

Qt Creator CMake port

2019-05-17 13:33:28 +00:00

FindQt5.cmake

CMake Build: Allow building with Qt5 and Qt6

2019-09-24 16:05:23 +00:00

Findyaml-cpp.cmake

CMake Build: Fix include directory for external yaml-cpp

2019-09-11 06:11:21 +00:00

QtCreatorAPI.cmake

Merge remote-tracking branch 'origin/4.11'

2019-12-07 18:39:54 +02:00

QtCreatorIDEBranding.cmake

Update version to 4.12 beta

2019-12-06 10:22:52 +00:00