Tim Jenssen 002d84cb15 Merge remote-tracking branch 'origin/11.0' into qds/dev ...

Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
  tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp

Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544

2023-06-02 19:26:05 +00:00

..

codemodel

Remove unused includes of QFutureInterface

2023-05-04 06:50:36 +00:00

persistenttrie

Fix qbs build for QML test

2023-05-02 11:17:36 +00:00

qmldesigner

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

2023-05-22 21:13:40 +02:00

qmleditor

Codeformatter: Support indenting of type annotated function

2023-04-20 12:55:40 +00:00

qmljssimplereader

Remove GPL-3.0+ from license identifiers

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

qmljsutils

Remove GPL-3.0+ from license identifiers

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

qrcparser

Remove GPL-3.0+ from license identifiers

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

reformatter

qmljsreformatter: don't default foreach type to "in"

2023-05-08 07:39:26 +00:00

CMakeLists.txt

QmlProject: Remove old test residuals

2023-05-24 12:09:38 +00:00

qml.qbs

Re-enable test

2023-05-23 13:01:30 +00:00