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

..

boost

Update License according to agreement with Free Qt Foundation

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

cli-io

Update License according to agreement with Free Qt Foundation

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

gui

Wholesale conversion to #pragma once

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

multi

debugger: add test code for multi-process debugging

2012-03-28 09:32:00 +02:00

python

debugger: rename manual tests from 'gdbdebugger' to 'debugger'

2011-08-24 13:54:34 +02:00

qquick1

Wholesale conversion to #pragma once

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

qquick2

Wholesale conversion to #pragma once

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

script

Update License according to agreement with Free Qt Foundation

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

simple

Merge remote-tracking branch 'origin/4.0'

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

spacy path

Update License according to agreement with Free Qt Foundation

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

spacy-file

Update License according to agreement with Free Qt Foundation

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

debugger.pro

Fix compilation

2014-01-07 10:39:54 +01:00