Eike Ziller 423ea729f8 Merge remote-tracking branch 'origin/4.13' into master ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportoptions.cpp

Change-Id: I3fd0d0a6a3ff30bb990da3dc0f78e69f9e1247ef

2020-09-23 10:11:44 +02:00

..

android

Android: update to latest SDK cmdline-tools

2020-07-01 13:26:44 +00:00

cplusplus

Clang: Fix error when including float.h with mingw

2020-07-09 17:24:16 +00:00

debugger

Merge remote-tracking branch 'origin/4.13' into master

2020-09-17 10:28:19 +02:00

glsl

GlslEditor: Update language spec

2020-07-17 04:45:01 +00:00

indexer_preincludes

CMake: Fix for installation

2020-06-12 17:33:43 +00:00

modeleditor

modeleditor: Intersect relations with shape of item

2020-02-25 19:21:48 +00:00

qml/qmlpuppet

QmlDesigner: Fix compile when building without Quick3D

2020-09-23 06:30:56 +00:00

qml-type-descriptions

QmlDesigner: Remove old properties

2020-09-03 06:51:48 +00:00

qmldesigner

Merge remote-tracking branch 'origin/4.13' into master

2020-09-23 10:11:44 +02:00

qmlicons

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

schemes

Change the shortcut for ui form preview

2010-08-25 11:57:02 +02:00

scripts

macOS: Force shell to a supported shell in Terminals opened from Qt Creator

2019-11-12 10:29:31 +00:00

snippets

C++: Fix highlighting Q_PROPERTY with template types

2020-07-08 14:41:11 +00:00

styles

Core: Allow different highlight colors in search result window

2020-09-18 09:33:07 +00:00

templates

Auto Test Project: Make CMakeLists.txt file Qt 6 compatible

2020-09-18 15:06:24 +00:00

themes

QmlDesigner: Add 3d axis colors to theme

2020-08-11 06:55:09 +00:00

translations

Update Russian translation

2020-09-02 03:23:10 +00:00

CMakeLists.txt

CMake: copy clang and resource files only if necessary

2020-05-11 22:36:30 +00:00

static.pro

Shared: Do not copy or install binary artifacts

2020-08-04 12:52:58 +00:00