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

..

auto

Merge remote-tracking branch 'origin/16.0' into HEAD

2025-02-17 18:08:12 +00:00

benchmarks

Remove GPL-3.0+ from license identifiers, part II

2023-01-06 10:27:36 +00:00

cpplocators/testdata_basic

CppLocatorFilter: Fix result sorting

2018-11-02 09:32:41 +00:00

cppmodelmanager

CppEditor: Let users disable the built-in indexer

2024-05-02 12:38:01 +00:00

cppsymbolsearcher/testdata_basic

Locator: Enable to show C++ type aliases

2021-02-09 10:00:56 +00:00

designer

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

genericprojectmanager

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

locators/testdata_basic

Locator: Allow to filter for path in BaseFileFilter

2013-08-29 08:27:53 +02:00

manual

Update application icons

2025-02-14 14:12:12 +00:00

qt4projectmanager/test1

…

system

SquishTests: Provide new settings for Windows

2025-02-11 06:51:17 +00:00

tools

Tests: Fix build

2024-04-18 09:52:28 +00:00

unit

Merge remote-tracking branch 'origin/16.0' into HEAD

2025-02-17 18:08:12 +00:00

CMakeLists.txt

Add feature to disable QmlDesigner and related files

2023-04-19 17:19:33 +00:00

tests.qbs

qbs build: Clean up testing infrastructure

2023-09-19 13:16:28 +00:00