Eike Ziller 3543bd5d1a Merge remote-tracking branch 'origin/4.4' ...

Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I7881fc51021c49b792a384ad9f8a4f71fc457ce2

2017-09-04 16:12:34 +02:00

..

auto

Merge remote-tracking branch 'origin/4.4'

2017-09-04 16:12:34 +02:00

benchmarks/json

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

cpplocators/testdata_basic

ObjC++: also index ObjC symbols.

2014-07-24 11:38:54 +02: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

helper

Squish: Replace Qt4 SDK by self-built Qt 4.8.7

2017-07-31 14:04:00 +00:00

locators/testdata_basic

Locator: Allow to filter for path in BaseFileFilter

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

manual

Add experimental .clang-format

2017-09-04 06:53:55 +00:00

qt4projectmanager/test1

Initial import

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

system

Merge remote-tracking branch 'origin/4.4'

2017-09-04 16:12:34 +02:00

tools

Update License according to agreement with Free Qt Foundation

2016-01-19 16:01:06 +00:00

unit

UnitTests: Fix wrong file name in pro file

2017-08-30 19:59:32 +00:00

tests.pro

Tests: Build clang unit tests when clang is enabled

2016-02-22 15:57:41 +00:00

tests.qbs

Add qbs project files for autotests.

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