Tim Jenssen 85ea2758ac Merge remote-tracking branch 'origin/qds/dev' into 12.0 ...

Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21

2023-10-05 15:53:42 +02:00

..

buildsystem

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

2023-10-05 15:53:42 +02:00

cmakegen

QmlProject: Fix issues with cmakefiles.txt generation

2023-09-22 11:49:28 +00:00

images

QmlProjectManager: Re-use folder "qml" icon overly from ProjectExplorer

2017-12-14 14:44:17 +00:00

qmlprojectgen

QmlProjectManager: Tr::tr

2023-01-19 15:53:58 +00:00

CMakeLists.txt

QmlDesigner: Disable warnings-as-errors by default

2023-06-27 12:33:15 +00:00

projectfilecontenttools.cpp

ProjectExplorer: Move some not-fully-session related bits

2023-03-01 09:26:50 +00:00

projectfilecontenttools.h

ProjectExplorer: Move some not-fully-session related bits

2023-03-01 09:26:50 +00:00

qdslandingpage.cpp

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

2023-03-26 16:26:18 +02:00

qdslandingpage.h

Remove GPL-3.0+ from license identifiers

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

qdslandingpagetheme.cpp

Remove GPL-3.0+ from license identifiers

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

qdslandingpagetheme.h

Remove GPL-3.0+ from license identifiers

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

qmlmainfileaspect.cpp

Utils: Rename the new Storage to Store

2023-08-24 05:56:57 +00:00

qmlmainfileaspect.h

Utils: Rename the new Storage to Store

2023-08-24 05:56:57 +00:00

qmlmultilanguageaspect.cpp

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

2023-09-14 17:37:24 +02:00

qmlmultilanguageaspect.h

Utils: Rename the new Storage to Store

2023-08-24 05:56:57 +00:00

qmlproject.cpp

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

2023-10-05 15:53:42 +02:00

qmlproject.h

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

2023-10-05 15:53:42 +02:00

qmlproject.qrc

QmlProjectManager: Re-use folder "qml" icon overly from ProjectExplorer

2017-12-14 14:44:17 +00:00

qmlprojectconstants.h

Remove GPL-3.0+ from license identifiers

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

qmlprojectmanager_global.h

Remove GPL-3.0+ from license identifiers

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

QmlProjectManager.json.in

Build: Change plugin json.in files to CMake style

2023-07-25 13:21:16 +00:00

qmlprojectmanager.qbs

QmlProjectManager: Fix Qbs build on Windows

2023-05-24 07:41:13 +00:00

qmlprojectmanagerconstants.h

Merge remote-tracking branch 'origin/9.0'

2023-01-13 09:16:25 +01:00

qmlprojectmanagertr.h

Translations: Change translation context prefix from "::" to "QtC::"

2023-02-10 16:27:55 +00:00

qmlprojectplugin.cpp

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

2023-10-05 15:53:42 +02:00

qmlprojectplugin.h

Use simpler Plugin::initialize() when feasible

2023-01-20 12:13:10 +00:00

qmlprojectrunconfiguration.cpp

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

2023-10-05 15:53:42 +02:00

qmlprojectrunconfiguration.h

Remove GPL-3.0+ from license identifiers

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