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
..
2022-01-20 12:18:15 +00:00
2023-01-06 11:15:13 +00:00
2023-02-14 15:13:46 +00:00
2023-01-27 16:22:41 +00:00
2023-01-27 16:22:41 +00:00
2023-02-09 13:46:50 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-05-26 12:55:57 +00:00
2023-01-06 11:15:13 +00:00
2023-03-29 12:21:50 +02:00
2023-05-15 10:05:54 +00:00
2023-05-17 06:29:03 +00:00
2023-06-02 19:26:05 +00:00
2023-01-06 11:15:13 +00:00
2023-03-28 07:54:44 +00:00
2022-01-20 12:18:15 +00:00
2023-05-22 06:40:13 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-03-06 17:45:49 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-05-22 21:13:40 +02:00
2023-02-09 13:46:50 +00:00
2023-03-20 10:03:23 +00:00