Orgad Shaneh 49f6b0146a Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82

2019-12-07 18:39:54 +02:00

..

auto

Merge remote-tracking branch 'origin/4.11'

2019-11-21 22:18:35 +02: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

Wholesale conversion to #pragma once

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

cppsymbolsearcher/testdata_basic

CppTools: Fix qualified ids in the symbol searcher

2013-09-13 15:41:02 +02: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 generic project for manual testing

2019-10-30 12:59:46 +00:00

qt4projectmanager/test1

Initial import

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

system

Squish: Fix compiler detection

2019-12-04 06:28:45 +00:00

tools

Tests: Adapt qml-ast2dot

2018-11-23 09:11:19 +00:00

unit

CMakeBuild: fix unittest msvc compile

2019-12-05 11:56:36 +00:00

CMakeLists.txt

CMake build: Add unittest CMake build files

2019-05-29 13:46:25 +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

Add qbs project files for autotests.

2013-09-09 12:16:09 +02:00