Eike Ziller 30f71eddf8 Merge remote-tracking branch 'origin/4.2' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I245212bd45104636b1c9737b36d3db3e4af23092

2016-11-01 09:30:49 +01:00

..

auto

Debugger: Disable Nim dumper auto test

2016-11-01 08:14:10 +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

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

QmlDesigner: Adding manual test for cpp mockups

2016-10-25 13:36:27 +00:00

qt4projectmanager/test1

Initial import

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

system

Squish: Update tst_session_handling again

2016-10-13 09:19:34 +00:00

tools

Update License according to agreement with Free Qt Foundation

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

unit

Clang: Add ostream for clang::StringRef

2016-10-31 14:23:44 +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