Tim Jenssen 1b6c0ff56c Merge remote-tracking branch 'origin/qds/dev' ...

Conflicts:
  coin/instructions/build.yaml
  doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc
  share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl
  src/libs/CMakeLists.txt
  src/libs/advanceddockingsystem/dockmanager.cpp
  src/libs/advanceddockingsystem/workspacedialog.cpp
  src/plugins/coreplugin/manhattanstyle.cpp
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmldesigner/components/formeditor/toolbox.cpp
  src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
  src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
  src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp
  src/plugins/qmldesignerbase/qmldesignerbaseplugin.h
  src/plugins/qmlprojectmanager/qmlproject.cpp
  src/tools/qml2puppet/CMakeLists.txt
  tests/unit/unittest/CMakeLists.txt

Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756

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

..

config

Doc: Try to make All Topics more visible

2023-04-26 12:21:38 +00:00

doxygen

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00

examples

CMakeProject templates/examples: Fix the install line

2023-04-05 08:47:20 +00:00

images

Merge remote-tracking branch 'origin/10.0'

2023-05-11 10:33:18 +02:00

src

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

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

qtcreator-online.qdocconf

Doc: Fix the \youtube macro for use with liteHTML help backend

2020-12-01 10:40:02 +00:00

qtcreator.qdocconf

Doc: Rearrange files in the doc folder

2020-01-27 09:05:07 +00:00