Tim Jenssen 846f8dba92 Merge remote-tracking branch 'origin/11.0' into qds/dev ...

Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e

2023-06-22 14:50:56 +00:00

..

buildsystem

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

2023-06-22 14:50:56 +00:00

cmakegen

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

2023-06-22 14:50:56 +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: Only enable error on warnings as you compile with tests or in debug

2023-06-07 11:32:02 +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

QmlProjectManager: fix warning when project has no mainScript

2023-06-07 09:50:15 +00:00

qmlmainfileaspect.h

Layouting: Make aspects operate on parent items, not LayoutBuilder

2023-05-03 13:44:28 +00:00

qmlmultilanguageaspect.cpp

ProjectExplorer: Move some not-fully-session related bits

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

qmlmultilanguageaspect.h

Remove GPL-3.0+ from license identifiers

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

qmlproject.cpp

Translations: Call Tr::tr() where it should

2023-06-09 12:04:26 +00:00

qmlproject.h

QmlProject: Remove unnecessary destructor

2023-05-16 06:16:46 +00: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

…

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'

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

qmlprojectplugin.h

Use simpler Plugin::initialize() when feasible

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

qmlprojectrunconfiguration.cpp

QmlProjectManager: use qml2puppet only if it is QtSudio Qt

2023-06-15 12:45:36 +00:00

qmlprojectrunconfiguration.h

Remove GPL-3.0+ from license identifiers

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