Eike Ziller f4e87a7e0c Merge remote-tracking branch 'origin/3.6' into 4.0 ...

Conflicts:
	src/plugins/projectexplorer/applicationlauncher.cpp
	src/plugins/projectexplorer/applicationlauncher.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qtsupport/uicodemodelsupport.cpp
	src/plugins/qtsupport/uicodemodelsupport.h

Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57

2016-03-03 16:10:04 +01:00

..

auto

Selection changer autotest: Fix build with namespaced Qt.

2016-02-29 15:14:37 +00: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

Update License according to agreement with Free Qt Foundation

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

cppsymbolsearcher/testdata_basic

CppTools: Fix qualified ids in the symbol searcher

2013-09-13 15:41:02 +02:00

designer

Designer: Insert into correct class for "Go to slot"

2013-11-26 11:52:45 +01:00

genericprojectmanager

GenericProject: put different languages into separate project parts.

2014-08-21 13:11:03 +02:00

locators/testdata_basic

Locator: Allow to filter for path in BaseFileFilter

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

manual

QmlDesigner: Explain frequent mistake in test project

2016-02-24 11:25:24 +00:00

qt4projectmanager/test1

Initial import

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

system

Merge remote-tracking branch 'origin/3.6' into 4.0

2016-03-03 16:10:04 +01:00

tools

Update License according to agreement with Free Qt Foundation

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

unit

Clang: Add some tests for lambda highlighting

2016-03-01 13:20:49 +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