Eike Ziller 22cdc47077 Merge remote-tracking branch 'origin/4.12' ...

Conflicts:
	src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp

Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6

2020-03-16 08:30:33 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/4.12'

2020-03-16 08:30:33 +01:00

CMakeLists.txt

Qt Creator CMake port

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

share.pro

Make Creator compile without Qt tools in some configuration

2017-02-10 13:30:53 +00:00

share.qbs

Android: Fix qbs build

2020-02-12 07:54:59 +00:00