Eike Ziller 3823b0af5f Merge remote-tracking branch 'origin/4.15' ...

Conflicts:
	src/libs/languageserverprotocol/workspace.cpp
	src/libs/languageserverprotocol/workspace.h

Change-Id: I739ae6642b1e2a505e351903f19df2550ef01629

2021-05-12 15:27:30 +02:00

..

android

Android: partially revert 4035fc2433

2020-11-30 17:29:26 +00:00

cplusplus

C++: Add source file to test icon support

2021-02-08 08:42:32 +00:00

debugger

Debugger: Do not omit original stack

2021-05-07 04:21:21 +00: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

QmlPuppet: Fix crash when editing importing 3D component

2021-05-10 12:46:26 +00:00

qml-type-descriptions

QmlDesigner: Remove old properties

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

qmldesigner

Revert "Revert "Merge remote-tracking branch 'origin/4.15'""

2021-05-07 09:07:40 +00:00

qmlicons

PNG: Run pngcrush on images with iCCP or sRGB profiles

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

schemes

…

scripts

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

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

snippets

ProjectExplorer: Clean up variables

2020-10-02 07:49:08 +00:00

styles

ClangCodeModel/TextEditor: Add support for highlighting parameters

2021-03-15 09:48:24 +00:00

templates

Merge remote-tracking branch 'origin/4.15'

2021-05-10 13:50:58 +02:00

themes

QmlDesigner: Replace CSS color role

2021-03-16 17:18:31 +00:00

translations

Embed target language in hu translation file

2021-01-06 09:31:12 +00:00

CMakeLists.txt

cmake build: Fix permissions of scripts in installation

2020-11-11 16:30:49 +00:00

static.pro

Shared: Do not copy or install binary artifacts

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