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
..
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-05-25 12:37:26 +00:00
2023-03-06 08:24:18 +01:00
2023-01-06 11:15:13 +00:00
2023-05-08 12:03:52 +00:00
2023-05-25 15:49:57 +02:00
2023-02-27 14:07:13 +00:00
2023-01-06 11:15:13 +00:00
2023-05-09 11:03:48 +00:00
2023-01-06 11:15:13 +00:00
2023-01-27 13:30:26 +00:00
2023-01-06 10:27:36 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-01-10 12:02:23 +00:00
2023-06-02 19:26:05 +00:00
2023-04-17 09:18:47 +00:00
2023-01-06 11:15:13 +00:00
2023-06-01 10:54:10 +00:00
2023-05-31 07:46:04 +00:00
2023-01-06 11:15:13 +00:00
2023-02-27 14:07:13 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-06-01 10:54:10 +00:00
2023-01-06 11:15:13 +00:00
2023-05-25 07:01:35 +00:00
2023-05-25 07:01:35 +00:00