Tim Jenssen 80e2eddd95 Merge remote-tracking branch 'origin/8.0' ...

resolved conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/designercore/exceptions/exception.cpp

Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0

2022-09-22 10:32:40 +02:00

..

android

Android: Fix version mapping from sdk_definitions.json

2022-07-04 08:26:04 +00:00

cplusplus

Use SPDX license identifiers

2022-08-26 12:27:18 +00:00

debugger

Debugger: Store tdata as member in Type

2022-09-08 10:20:33 +00:00

glsl

Use SPDX license identifiers

2022-08-26 12:27:18 +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

Merge remote-tracking branch 'origin/8.0'

2022-09-22 10:32:40 +02:00

qml-type-descriptions

Update qbs submodule

2022-02-17 09:18:12 +00:00

qmldesigner

Merge remote-tracking branch 'origin/8.0'

2022-09-22 10:32:40 +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

Use SPDX license identifiers

2022-08-26 12:27:18 +00:00

snippets

ProjectExplorer: Clean up variables

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

styles

Editor: reduce brightness of visual whitespace in dark schemes

2022-09-02 08:43:42 +00:00

templates

Use SPDX license identifiers

2022-08-26 12:27:18 +00:00

themes

Merge remote-tracking branch 'origin/8.0'

2022-09-20 15:43:56 +02:00

translations

Designer: Convert to using Tr::tr

2022-09-22 07:34:30 +00:00

CMakeLists.txt

debugger: Fix dumper for std::string and unordered_multiset

2022-08-23 10:49:43 +00:00