Eike Ziller 0f94aa3f4d Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/projectexplorer/projectwizardpage.cpp
	src/plugins/projectexplorer/xcodebuildparser.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp
	src/tools/clangbackend/ipcsource/translationunits.cpp

Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6

2016-05-03 11:49:01 +02:00

..

ast

Update License according to agreement with Free Qt Foundation

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

c99

Update License according to agreement with Free Qt Foundation

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

checksymbols

C++: Guard against parent binding loop

2016-04-27 11:42:21 +00:00

codeformatter

Update License according to agreement with Free Qt Foundation

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

cppselectionchanger

Selection changer autotest: Fix build with namespaced Qt.

2016-02-29 15:14:37 +00:00

cxx11

Update License according to agreement with Free Qt Foundation

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

fileiterationorder

Update License according to agreement with Free Qt Foundation

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

findusages

Update License according to agreement with Free Qt Foundation

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

lexer

C++: fix digraph parsing for <:: exception.

2016-03-08 17:24:33 +00:00

lookup

Update License according to agreement with Free Qt Foundation

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

misc

Update License according to agreement with Free Qt Foundation

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

preprocessor

C++: fix trigraph parsing in macros.

2016-03-08 17:24:22 +00:00

semantic

Update License according to agreement with Free Qt Foundation

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

shared

Centralize addition of plugin library paths

2014-05-08 15:29:21 +02:00

translationunit

Update License according to agreement with Free Qt Foundation

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

typeprettyprinter

Update License according to agreement with Free Qt Foundation

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

cplusplus_global.h

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

cplusplus.pro

C++: Implement context-aware expand / shrink selection actions.

2016-02-29 08:15:03 +00:00

cplusplus.qbs

C++: Implement context-aware expand / shrink selection actions.

2016-02-29 08:15:03 +00:00

cplusplusautotest.qbs

qbs build: Remove unneeded import statements.

2014-11-10 15:45:14 +01:00