Eike Ziller 49ecd64b9c Merge remote-tracking branch 'origin/7.0' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/docker/dockerdevice.cpp
	src/plugins/mcusupport/mcupackage.cpp
	src/plugins/mcusupport/mcupackage.h
	src/plugins/mcusupport/mcusupportoptions.cpp
	src/plugins/mcusupport/mcusupportoptions.h
	src/plugins/mcusupport/mcusupportoptionspage.cpp
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/mcusupport/mcusupportsdk.h

Change-Id: I8c8f5953a21729ba9178dbc44ed613eed131a0c8

2022-02-16 10:59:04 +01:00

..

auto

Merge remote-tracking branch 'origin/7.0'

2022-02-16 10:59:04 +01:00

benchmarks

Tests: Add a benchmark for Qt signals vs plain callback

2018-02-21 09:53:17 +00:00

cpplocators/testdata_basic

CppLocatorFilter: Fix result sorting

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

cppmodelmanager

C++ Refactoring: Fix the include macros in header files after renaming

2020-08-21 06:50:42 +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

Tests: Provide some cmake files for manual tests

2022-02-15 08:21:40 +00:00

qt4projectmanager/test1

Initial import

2008-12-02 12:01:29 +01:00

system

Merge remote-tracking branch 'origin/6.0' into 7.0

2022-02-11 10:49:15 +01:00

tools

Tests: Adapt to qmljs updates

2022-01-14 08:24:12 +00:00

unit

Require CMake 3.16 and remove workarounds

2022-02-02 08:55:31 +00:00

CMakeLists.txt

UnitTests: Re-enable CMake unittests

2020-07-24 10:05:45 +00:00

tests.qbs

Include some existing manual tests in the Qbs build system

2020-12-11 13:35:11 +00:00