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
..
2024-07-15 14:29:18 +00:00
2023-12-04 10:24:17 +00:00
2024-12-19 13:23:14 +00:00
2023-01-06 11:15:13 +00:00
2025-01-21 10:09:57 +00:00
2025-02-10 09:57:20 +00:00
2023-01-06 11:15:13 +00:00
2024-06-05 11:46:04 +00:00
2024-01-19 09:44:53 +00:00
2024-11-22 14:54:56 +00:00
2023-01-06 11:15:13 +00:00
2023-06-30 09:58:10 +00:00
2023-01-06 11:15:13 +00:00
2023-01-27 13:30:26 +00:00
2024-06-13 06:09:47 +00:00
2025-01-21 10:09:57 +00:00
2023-01-06 11:15:13 +00:00
2023-01-06 11:15:13 +00:00
2023-11-14 14:27:45 +00:00
2025-02-17 18:08:12 +00:00
2023-01-06 11:15:13 +00:00
2025-01-20 12:35:41 +00:00
2024-03-25 08:57:37 +00:00
2024-01-19 10:29:33 +00:00
2023-09-12 14:28:15 +00:00
2023-08-10 12:15:12 +00:00
2023-01-06 11:15:13 +00:00
2025-02-17 18:08:12 +00:00
2024-11-01 15:16:18 +00:00
2023-09-19 13:16:28 +00:00
2024-01-30 07:56:31 +00:00