Tim Jenssen 66263782ec Merge remote-tracking branch 'origin/11.0' into qds/dev ...

Conflicts:
  src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
  src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
  src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I4c8a33736b25c3bb24241224d0a1e7358bb7fd94

2023-06-08 16:35:56 +02:00

..

auto

Merge remote-tracking branch 'origin/11.0' into qds/dev

2023-06-08 16:35:56 +02:00

benchmarks

Remove GPL-3.0+ from license identifiers, part II

2023-01-06 10:27:36 +00:00

cpplocators/testdata_basic

CppLocatorFilter: Fix result sorting

2018-11-02 09:32:41 +00:00

cppmodelmanager

Remove GPL-3.0+ from license identifiers

2023-01-06 11:15:13 +00:00

cppsymbolsearcher/testdata_basic

Locator: Enable to show C++ type aliases

2021-02-09 10:00:56 +00:00

designer

…

genericprojectmanager

…

locators/testdata_basic

…

manual

ImageScaling: Implement the example using TaskTree

2023-06-07 09:27:40 +00:00

qt4projectmanager/test1

…

system

SquishTests: Fix expected clone output

2023-06-08 05:06:45 +00:00

tools

Remove GPL-3.0+ from license identifiers

2023-01-06 11:15:13 +00:00

unit

Merge remote-tracking branch 'origin/11.0' into qds/dev

2023-06-08 16:35:56 +02:00

CMakeLists.txt

Add feature to disable QmlDesigner and related files

2023-04-19 17:19:33 +00:00

tests.qbs

Tests: Add build files for qml-ast2dot

2022-02-23 08:44:36 +00:00