Oswald Buddenhagen 5a7d3e78db Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ifbe181e86c161e082cc9a69a4bc7bd399f34ff47

2016-01-04 14:11:07 +01:00

..

data

Merge remote-tracking branch 'origin/3.6'

2016-01-04 14:11:07 +01:00

activationsequencecontextprocessortest.cpp

Clang: Use "clang" prefix plugin files

2015-11-30 11:04:07 +00:00

activationsequenceprocessortest.cpp

Clang: Use "clang" prefix plugin files

2015-11-30 11:04:07 +00:00

chunksreportedmonitor.cpp

Clang: Integrate highlighting results from backend

2015-11-26 15:19:27 +00:00

chunksreportedmonitor.h

Clang: Integrate highlighting results from backend

2015-11-26 15:19:27 +00:00

clang_dependency.pri

Clang: Clean up unittest.pro

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

clangcodecompleteresultstest.cpp

Clang: Tests on MSVC2013: Fix file name clashes

2015-11-26 13:54:21 +00:00

clangcompletioncontextanalyzertest.cpp

Clang: Fix completion position for clang and proposal

2015-07-27 13:19:02 +00:00

clangdiagnosticfiltertest.cpp

Clang: Integrate clang's fixits as refactoring actions

2015-09-29 11:39:21 +00:00

clangfixitoperationtest.cpp

Clang: Use line and column instead of offset for diagnostics

2015-12-07 11:10:05 +00:00

clangipcservertest.cpp

Clang: Fix slowness of code completion after opening the file

2015-12-02 12:37:25 +00:00

clangstringtest.cpp

Clang: Extract highlighting information

2015-11-17 12:41:37 +00:00

clientserverinprocesstest.cpp

Clang: Fix slowness of code completion after opening the file

2015-12-02 12:37:25 +00:00

clientserveroutsideprocess.cpp

Clang: Fix slowness of code completion after opening the file

2015-12-02 12:37:25 +00:00

codecompletionsextractortest.cpp

Clang: Flatten code completion chunks

2015-12-16 12:16:08 +00:00

codecompletiontest.cpp

Clang: Don't reparse before code completion

2015-11-30 15:49:19 +00:00

completionchunkstotextconvertertest.cpp

Clang: Fix displaying template parameters II

2015-12-16 15:38:36 +00:00

cplusplus.pri

Clang: Clean up unittest.pro

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

createtablesqlstatementbuildertest.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

2015-06-16 13:29:27 +00:00

creator_dependency.pri

Clang: Add revision and completion management

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

cursortest.cpp

Clang: Tests on MSVC2013: Fix file name clashes

2015-11-26 13:54:21 +00:00

diagnosticsettest.cpp

Clang: Use line and column instead of offset for diagnostics

2015-12-07 11:10:05 +00:00

diagnostictest.cpp

Clang: Use line and column instead of offset for diagnostics

2015-12-07 11:10:05 +00:00

fixittest.cpp

Clang: Tests on MSVC2013: Fix file name clashes

2015-11-26 13:54:21 +00:00

gmock_dependency.pri

Clang: Fix auto-detection of gtest/gmock on debian family

2016-01-04 10:53:50 +00:00

gtest-qt-printing.h

Clang: Reorder includes

2015-06-16 13:53:30 +00:00

highlightinginformationstest.cpp

Merge remote-tracking branch 'origin/3.6'

2016-01-04 14:11:07 +01:00

highlightingmarksreportertest.cpp

Clang: Use "clang" prefix plugin files

2015-11-30 11:04:07 +00:00

lineprefixertest.cpp

Strip BOM from files

2015-10-01 10:51:10 +00:00

main.cpp

Clang: Disable logging by default in unit tests

2015-10-01 13:04:59 +00:00

matcher-diagnosticcontainer.h

Clang: Report only diagnostics that can be shown in the editor

2015-11-16 14:18:37 +00:00

mockipclient.h

Clang: Integrate highlighting results from backend

2015-11-26 15:19:27 +00:00

mockipcserver.h

Clang: Integrate highlighting results from backend

2015-11-26 15:19:27 +00:00

mocksenddocumentannotationscallback.h

Clang: Rename "Editor Updates" to "Document Annotations"

2015-11-30 11:11:32 +00:00

projecttest.cpp

Strip BOM from files

2015-10-01 10:51:10 +00:00

readandwritemessageblocktest.cpp

Clang: Fix slowness of code completion after opening the file

2015-12-02 12:37:25 +00:00

senddocumenttrackertest.cpp

Clang: Add one more test for SendDocumentTracker

2015-09-30 14:44:09 +00:00

skippedsourcerangestest.cpp

Clang: Fix GCC 5.3 warnings in unit tests

2016-01-04 10:07:39 +00:00

sourcelocationtest.cpp

Clang: Tests on MSVC2013: Fix file name clashes

2015-11-26 13:54:21 +00:00

sourcerangetest.cpp

Clang: Tests on MSVC2013: Fix file name clashes

2015-11-26 13:54:21 +00:00

spydummy.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

2015-06-16 13:29:27 +00:00

spydummy.h

Clang: Rename CodeModelBackEnd in ClangBackEnd

2015-06-16 13:29:27 +00:00

sqlitecolumntest.cpp

Clang: Tests: Fix unit tests compilation on Windows

2015-07-02 13:16:16 +00:00

sqlitedatabasebackendtest.cpp

Clang: Tests: Fix unit tests compilation on Windows

2015-07-02 13:16:16 +00:00

sqlitedatabasetest.cpp

Clang: Tests: Fix unit tests compilation on Windows

2015-07-02 13:16:16 +00:00

sqlitestatementtest.cpp

Clang: Tests: Fix unit tests compilation on Windows

2015-07-02 13:16:16 +00:00

sqlitetabletest.cpp

Clang: Tests: Fix unit tests compilation on Windows

2015-07-02 13:16:16 +00:00

sqlstatementbuildertest.cpp

Clang: Tests: Fix unit tests compilation on Windows

2015-07-02 13:16:16 +00:00

translationunitstest.cpp

Clang: Reparse editor document on project change

2015-12-07 15:49:33 +00:00

translationunittest.cpp

Clang: Reparse editor document on project change

2015-12-07 15:49:33 +00:00

unittest.pro

Clang: Rename "Editor Updates" to "Document Annotations"

2015-11-30 11:11:32 +00:00

unsavedfilestest.cpp

Clang: Fix GCC 5.3 warnings in unit tests

2016-01-04 10:07:39 +00:00

utf8test.cpp

Sqlite: Add endsWith to UtfString

2015-08-25 12:54:38 +00:00