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

Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98

2017-01-11 09:29:37 +01:00

..

auto

QmlDesigner: remove unnecessary save method

2017-01-06 11:26:27 +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: Fix ambiguous ids in plugin testproject

2016-11-24 09:48:22 +00:00

qt4projectmanager/test1

Initial import

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

system

Squish: Replace progressBarWait() in tst_debug_empty_main

2017-01-09 11:56:18 +00:00

tools

Update License according to agreement with Free Qt Foundation

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

unit

UnitTests: Add rpath to $$LLVM_LIBDIR

2017-01-06 09:39:22 +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