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-18 10:11:48 +00:00
2023-01-10 08:05:04 +00:00
2023-04-20 12:51:22 +00:00
2023-01-10 08:05:04 +00:00
2020-06-12 17:33:43 +00:00
2020-02-25 19:21:48 +00:00
2023-04-21 09:16:40 +00:00
2023-06-02 19:26:05 +00:00
2015-07-03 09:50:46 +00:00
2010-08-25 11:57:02 +02:00
2023-04-20 07:44:42 +00:00
2022-11-07 07:33:56 +00:00
2023-05-26 13:50:18 +00:00
2023-03-30 13:30:42 +00:00
2023-06-01 15:12:54 +00:00
2023-04-05 06:26:11 +00:00