Eike Ziller c0cfafdd3d Merge remote-tracking branch 'origin/4.15' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395

2021-04-06 15:17:40 +02:00

..

auto

Support for QML module mapping

2021-03-19 10:43:23 +00: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

Support for QML module mapping

2021-03-19 10:43:23 +00:00

qt4projectmanager/test1

Initial import

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

system

Merge remote-tracking branch 'origin/4.14' into 4.15

2021-03-18 09:29:51 +01:00

tools

QmlJS: Fix compile

2020-03-04 08:22:12 +00:00

unit

Merge remote-tracking branch 'origin/4.15'

2021-04-06 15:17:40 +02:00

CMakeLists.txt

UnitTests: Re-enable CMake unittests

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

tests.pro

Add some sanity to the clang detection code for qmake build

2017-11-22 08:47:05 +00:00

tests.qbs

Include some existing manual tests in the Qbs build system

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