Files
qt-creator/dist
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
..
2016-11-02 12:07:33 +00:00
2022-06-29 12:04:37 +00:00
2015-02-18 12:38:23 +00:00