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
..
2020-10-22 11:45:12 +00:00
2023-02-24 05:24:06 +00:00
2022-05-24 14:57:22 +00:00
2022-05-12 10:06:03 +00:00
2022-12-20 11:05:01 +01:00
2021-08-18 11:58:46 +00:00
2019-05-17 13:33:28 +00:00
2023-02-23 09:29:28 +00:00
2023-05-12 12:49:05 +00:00
2023-05-16 09:45:46 +00:00
2023-03-02 10:17:58 +01:00
2023-06-22 12:04:56 +00:00
2023-06-20 06:54:10 +00:00
2021-08-19 14:00:33 +00:00
2020-11-17 11:32:32 +00:00
2023-01-05 10:13:16 +00:00