Oswald Buddenhagen 777ca8e655 Merge remote-tracking branch 'origin/4.5' ...

Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f

2017-12-21 13:20:24 +01:00

..

auto

Merge remote-tracking branch 'origin/4.5'

2017-12-21 13:20:24 +01:00

benchmarks/json

Update License according to agreement with Free Qt Foundation

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

cpplocators/testdata_basic

CppTools: Match also function arguments in locator

2017-11-02 09:26:17 +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

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

Tests: Fix compile

2017-12-20 10:12:50 +00:00

qt4projectmanager/test1

Initial import

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

system

Merge remote-tracking branch 'origin/4.5'

2017-12-21 13:20:24 +01:00

tools

Update License according to agreement with Free Qt Foundation

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

unit

Clang: add globalFollowSymbol to RefactoringEngine

2017-12-14 14:25:14 +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