Eike Ziller 5432dd1f5c Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67

2018-02-07 11:58:23 +01:00

..

complete_arrow.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_completer_main_unsaved.cpp

Clang: Tests for code completion

2015-08-04 16:16:45 +00:00

complete_completer_main.cpp

Clang: Tests for code completion

2015-08-04 16:16:45 +00:00

complete_extractor_brief_comment.cpp

Strip BOM from files

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

complete_extractor_class.cpp

Clang: Show type icon for usings/typedefs

2015-12-08 13:05:02 +00:00

complete_extractor_constructor.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_extractor_enumeration.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_extractor_function_unsaved_2.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_extractor_function_unsaved.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_extractor_function.cpp

Strip BOM from files

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

complete_extractor_functionoverload.cpp

Clang: Show function signature hint for constructors and functors

2017-05-11 11:54:09 +00:00

complete_extractor_namespace.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_extractor_variable.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_forwarding_header_1.h

Wholesale conversion to #pragma once

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

complete_forwarding_header_2.h

Wholesale conversion to #pragma once

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

complete_smartpointer.cpp

Clang: Workaround completion for make_unique/shared

2017-09-08 10:13:08 +00:00

complete_target_header_changed.h

Wholesale conversion to #pragma once

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

complete_target_header_unsaved.h

Wholesale conversion to #pragma once

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

complete_target_header.h

Wholesale conversion to #pragma once

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

complete_testfile_1.cpp

Update License according to agreement with Free Qt Foundation

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

complete_translationunit_parse_error.cpp

Clang: Rename CodeModelBackEnd in ClangBackEnd

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

complete_withDotArrowCorrectionForForwardDeclaredClassPointer.cpp

Clang: fix completion after forward-declared class

2017-06-09 07:05:25 +00:00

complete_withDotArrowCorrectionForPointer_afterTyping.cpp

Clang: Fix dot-arrow-correction for not-yet-parsed unsaved content

2016-06-24 08:31:28 +00:00

complete_withDotArrowCorrectionForPointer_beforeTyping.cpp

Clang: Fix dot-arrow-correction for not-yet-parsed unsaved content

2016-06-24 08:31:28 +00:00

complete_withDotArrowCorrectionForPointer.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_withDotArrowCorrectionForPointerInitial.cpp

Clang: Fix dot to arrow correction

2016-05-03 12:19:13 +00:00

complete_withDotArrowCorrectionForPointerUpdated.cpp

Clang: Fix dot to arrow correction

2016-05-03 12:19:13 +00:00

complete_withGlobalCompletionAfterForwardDeclaredClassPointer.cpp

Clang: fix completion after forward-declared class

2017-06-09 07:05:25 +00:00

complete_withNoDotArrowCorrectionForArrowDot.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_withNoDotArrowCorrectionForColonColon.cpp

Clang: Workaround dot detection for arrow correction

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

complete_withNoDotArrowCorrectionForDotDot.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_withNoDotArrowCorrectionForFloat.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_withNoDotArrowCorrectionForObject.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_withNoDotArrowCorrectionForObjectWithArrowOperator.cpp

Clang: Correct member access operator if possible

2016-01-19 13:20:35 +00:00

complete_withNoDotArrowCorrectionForOnlyDot.cpp

Clang: fix completion after forward-declared class

2017-06-09 07:05:25 +00:00

cursor.cpp

Clang: introduce more data in TokenInfo

2018-02-02 07:01:28 +00:00

cursor.h

Clang: introduce more data in TokenInfo

2018-02-02 07:01:28 +00:00

diagnostic_comparison_fixit_expected1.cpp

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_comparison_fixit_expected2.cpp

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_comparison_fixit.cpp

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_diagnostic.cpp

Clang: Tests: Use test data working with clang 3.6 *and* clang 3.8

2016-06-22 12:39:39 +00:00

diagnostic_diagnosticset_header.cpp

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

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

diagnostic_diagnosticset_mainfile.cpp

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

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

diagnostic_diagnosticset.cpp

Clang: Add diagnostics

2015-08-31 14:59:16 +00:00

diagnostic_erroneous_header.h

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_erroneous_source.cpp

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_semicolon_fixit_expected.cpp

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_semicolon_fixit.cpp

Clang: Integrate clang's fixits as refactoring actions

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

diagnostic_source_location.cpp

Clang: Add diagnostics

2015-08-31 14:59:16 +00:00

diagnostic_source_range.cpp

Clang: Filter out invalid diagnostic ranges

2015-11-06 11:33:12 +00:00

empty1.cpp

Clang: Suspend least recently used translation units

2017-08-03 08:27:32 +00:00

empty2.cpp

Clang: Suspend least recently used translation units

2017-08-03 08:27:32 +00:00

empty3.cpp

Clang: Suspend least recently used translation units

2017-08-03 08:27:32 +00:00

followsymbol_header.h

Clang: add unit-tests for follow symbol

2017-08-18 12:10:02 +00:00

followsymbol_main.cpp

CppEditor: refactor FollowSymbol

2017-09-15 14:14:01 +00:00

highlightingmarks.cpp

Merge remote-tracking branch 'origin/4.6'

2018-02-07 11:58:23 +01:00

highlightingmarks.h

Clang: Rename HighlightingInformation to HighlightingMark

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

include_testfile.cpp

Update License according to agreement with Free Qt Foundation

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

includecollector_external1.h

Clang: Improve speed by content generation

2017-02-16 17:39:05 +00:00

includecollector_external2.h

Clang: Add ClangPchManager

2017-01-30 13:55:58 +00:00

includecollector_external3.h

Clang: Add ClangPchManager

2017-01-30 13:55:58 +00:00

includecollector_false.h

Clang: Add test for include collector

2017-02-16 17:39:16 +00:00

includecollector_header1.h

Clang: Add ClangPchManager

2017-01-30 13:55:58 +00:00

includecollector_header2.h

Clang: Improve speed by content generation

2017-02-16 17:39:05 +00:00

includecollector_if.cpp

Clang: Add test for include collector

2017-02-16 17:39:16 +00:00

includecollector_indirect_external.h

Clang: Improve speed by content generation

2017-02-16 17:39:05 +00:00

includecollector_main2.cpp

Clang: Handle generated files

2017-02-01 13:11:15 +00:00

includecollector_main3.cpp

Clang: Add ClangPchManager

2017-01-30 13:55:58 +00:00

includecollector_main.cpp

Clang: Add ClangPchManager

2017-01-30 13:55:58 +00:00

includecollector_missingfile.cpp

Clang: Work around missing file

2017-02-21 08:25:47 +00:00

includecollector_true.h

Clang: Add test for include collector

2017-02-16 17:39:16 +00:00

query_simpleclass.cpp

Clang: Add clang query

2016-11-15 15:30:33 +00:00

query_simplefunction2.cpp

Clang: Filter duplicates in clang query output

2017-07-03 09:57:57 +00:00

query_simplefunction2.h

Clang: Filter duplicates in clang query output

2017-07-03 09:57:57 +00:00

query_simplefunction3.cpp

Clang: Filter duplicates in clang query output

2017-07-03 09:57:57 +00:00

query_simplefunction.cpp

Clang: Add clang query

2016-11-15 15:30:33 +00:00

references.cpp

Clang: Provide highlighting for identifier under cursor

2017-06-14 12:49:05 +00:00

renamevariable.cpp

Clang: Fix template renaming

2016-08-08 13:50:25 +00:00

skippedsourceranges.cpp

Clang: Extract highlighting information

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

sourcerangeextractor_location.cpp

Clang: Extend clang query

2016-11-23 12:16:04 +00:00

symbolfinder_macro.cpp

Clang: Add clang refactoring

2016-08-04 14:37:19 +00:00

symbolindexing_main1.cpp

Clang: Add Symbol Indexing

2017-09-14 13:39:55 +00:00

symbolscollector_defines.h

Clang: Improve Macro collection

2018-02-01 14:47:46 +00:00

symbolscollector_header1.h

Clang: Collect source files

2018-01-03 14:45:04 +00:00

symbolscollector_header2.h

Clang: Collect source files

2018-01-03 14:45:04 +00:00

symbolscollector_header3.h

Clang: Collect source dependencies

2018-02-01 15:06:09 +00:00

symbolscollector_main2.cpp

Clang: Collect source dependencies

2018-02-01 15:06:09 +00:00

symbolscollector_main.cpp

Clang: Collect source files

2018-01-03 14:45:04 +00:00

symbolscollector_simple.cpp

Clang: Add symbols collector

2017-08-29 16:37:09 +00:00

symbolscollector_unsaved.cpp

Clang: Add Symbol Indexing

2017-09-14 13:39:55 +00:00

tooltipinfo.cpp

Clang: Fix tooltips for constructors

2018-01-22 12:33:21 +00:00

tooltipinfo.h

Clang: Provide tooltips

2018-01-16 15:32:15 +00:00

translationunits.cpp

Clang: Reparse only if files are changed

2015-08-31 15:00:07 +00:00

translationunits.h

Wholesale conversion to #pragma once

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