Tim Jenssen
9e6a2cc2da
Merge remote-tracking branch 'origin/16.0' into HEAD
solved conflicts in:
cmake/Utils.cmake
src/libs/sqlite/sqliteids.h
src/libs/utils/filepath.cpp
src/plugins/effectcomposer/effectcomposermodel.cpp
src/plugins/effectcomposer/effectcomposerview.cpp
src/plugins/effectcomposer/effectshaderscodeeditor.h
src/plugins/mcusupport/mcubuildstep.cpp
src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp
src/plugins/qmldesigner/components/devicesharing/devicemanager.cpp
src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
src/plugins/qmlprojectmanager/qmlprojectexporter/resourcegenerator.cpp
Change-Id: Ia2f6ccfd39007dad1cb8317f5ac878109621aaa2
2025-02-17 18:08:12 +00:00
..
2023-01-06 11:15:13 +00:00
2024-10-02 10:52:48 +00:00
2024-11-01 15:29:10 +00:00
2025-01-10 13:05:29 +00:00
2024-11-15 11:05:50 +00:00
2024-02-23 07:55:23 +00:00
2025-01-30 08:21:30 +00:00
2025-02-07 10:17:43 +00:00
2025-01-10 13:05:29 +00:00
2024-12-09 08:58:25 +00:00
2023-01-06 11:15:13 +00:00
2024-09-23 10:29:44 +00:00
2023-01-06 11:15:13 +00:00
2023-03-24 13:42:50 +00:00
2023-08-10 12:15:12 +00:00
2024-05-23 13:04:22 +00:00
2025-02-12 15:13:01 +00:00
2025-01-10 13:05:29 +00:00
2024-11-21 13:30:21 +00:00
2023-11-15 14:00:03 +00:00
2023-01-06 11:15:13 +00:00
2023-05-17 13:36:18 +00:00
2023-01-06 11:15:13 +00:00
2025-01-10 13:05:29 +00:00
2025-01-30 08:21:14 +00:00
2025-01-30 08:21:14 +00:00