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

..

data

Wholesale conversion to #pragma once

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

activationsequencecontextprocessortest.cpp

Update License according to agreement with Free Qt Foundation

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

activationsequenceprocessortest.cpp

Update License according to agreement with Free Qt Foundation

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

benchmark_dependency.pri

Clang: Add Google Benchmark unit tests

2016-02-17 10:35:34 +00:00

chunksreportedmonitor.cpp

Update License according to agreement with Free Qt Foundation

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

chunksreportedmonitor.h

Wholesale conversion to #pragma once

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

clang_dependency.pri

Clang: Clean up unittest.pro

2015-07-23 11:48:32 +00:00

clangcodecompleteresultstest.cpp

Update License according to agreement with Free Qt Foundation

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

clangcompletioncontextanalyzertest.cpp

Clang: Fix SOFT ASSERT: "!m_functionName.isEmpty()"

2016-04-20 13:03:32 +00:00

clangdiagnosticfiltertest.cpp

Clang: Ignore certain warnings in header files

2016-02-25 13:31:15 +00:00

clangfixitoperationtest.cpp

Update License according to agreement with Free Qt Foundation

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

clangipcservertest.cpp

Clang: Add Declaration highlighting

2016-03-07 12:07:21 +00:00

clangisdiagnosticrelatedtolocationtest.cpp

Clang: Fix broken windows build

2016-02-16 18:27:44 +00:00

clangstringtest.cpp

Update License according to agreement with Free Qt Foundation

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

clientserverinprocesstest.cpp

Clang: Use MessageEnvelop instead of QVariant

2016-02-08 14:11:44 +00:00

clientserveroutsideprocess.cpp

Clang: Use MessageEnvelop instead of QVariant

2016-02-08 14:11:44 +00:00

codecompletionsextractortest.cpp

Clang: Introduce UnsavedFile wrapper

2016-02-01 12:20:53 +00:00

codecompletiontest.cpp

Clang: Fix variable name in test

2016-02-01 15:17:11 +00:00

completionchunkstotextconvertertest.cpp

Update License according to agreement with Free Qt Foundation

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

cplusplus.pri

Clang: Clean up unittest.pro

2015-07-23 11:48:32 +00:00

createtablesqlstatementbuildertest.cpp

Update License according to agreement with Free Qt Foundation

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

creator_dependency.pri

Clang: Add revision and completion management

2015-09-28 15:46:15 +00:00

cursortest.cpp

Update License according to agreement with Free Qt Foundation

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

diagnosticsettest.cpp

Clang: Display also child diagnostics in tooltips

2016-02-12 11:54:09 +00:00

diagnostictest.cpp

Clang: Display also child diagnostics in tooltips

2016-02-12 11:54:09 +00:00

fixittest.cpp

Update License according to agreement with Free Qt Foundation

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

gmock_dependency.pri

Test: Fix typo in gmock detection message

2016-04-18 11:14:06 +00:00

gtest-qt-printing.h

Wholesale conversion to #pragma once

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

highlightingmarksreportertest.cpp

Clang: Rename HighlightingInformation to HighlightingMark

2016-03-07 12:06:40 +00:00

highlightingmarkstest.cpp

Clang: Remove unused function

2016-03-07 14:07:07 +00:00

lineprefixertest.cpp

Update License according to agreement with Free Qt Foundation

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

main.cpp

Clang: Add Google Benchmark unit tests

2016-02-17 10:35:34 +00:00

matcher-diagnosticcontainer.h

Update License according to agreement with Free Qt Foundation

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

mockipclient.h

Wholesale conversion to #pragma once

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

mockipcserver.h

Wholesale conversion to #pragma once

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

mocksenddocumentannotationscallback.h

Wholesale conversion to #pragma once

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

projecttest.cpp

Update License according to agreement with Free Qt Foundation

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

readandwritemessageblocktest.cpp

Clang: Use MessageEnvelop instead of QVariant

2016-02-08 14:11:44 +00:00

senddocumenttrackertest.cpp

Update License according to agreement with Free Qt Foundation

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

sizedarraytest.cpp

Utils: Add sized array

2016-02-22 14:53:12 +00:00

skippedsourcerangestest.cpp

Update License according to agreement with Free Qt Foundation

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

smallstringbenchmark.cpp

Tests: Fix wrong license header

2016-02-22 07:22:36 +00:00

smallstringtest.cpp

Utils: Add constructor for character pointer

2016-03-08 11:50:30 +00:00

sourcelocationtest.cpp

Update License according to agreement with Free Qt Foundation

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

sourcerangetest.cpp

Update License according to agreement with Free Qt Foundation

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

spydummy.cpp

Update License according to agreement with Free Qt Foundation

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

spydummy.h

Wholesale conversion to #pragma once

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

sqlitecolumntest.cpp

Update License according to agreement with Free Qt Foundation

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

sqlitedatabasebackendtest.cpp

Update License according to agreement with Free Qt Foundation

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

sqlitedatabasetest.cpp

Update License according to agreement with Free Qt Foundation

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

sqlitestatementtest.cpp

Update License according to agreement with Free Qt Foundation

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

sqlitetabletest.cpp

Update License according to agreement with Free Qt Foundation

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

sqlstatementbuildertest.cpp

Update License according to agreement with Free Qt Foundation

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

translationunitstest.cpp

Merge remote-tracking branch 'origin/4.0'

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

translationunittest.cpp

Merge remote-tracking branch 'origin/4.0'

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

unittest.pro

Merge remote-tracking branch 'origin/4.0'

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

unsavedfilestest.cpp

Clang: Introduce UnsavedFile wrapper

2016-02-01 12:20:53 +00:00

unsavedfiletest.cpp

Clang: Workaround dot detection for arrow correction

2016-02-01 12:20:58 +00:00

utf8test.cpp

Update License according to agreement with Free Qt Foundation

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