feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
This commit is contained in:
Eike Ziller
2021-12-16 10:50:33 +01:00
parent 7c674e0a5b 21c1d8fd60
commit 85b60d9608
156 changed files with 2801 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangcodemodel/CMakeLists.txt
View File

@@ -78,7 +78,7 @@ elseif(MSVC)
set(big_obj_compile_option "/bigobj")
endif()
extend_qtc_plugin(ClangCodeModel
CONDITION DEFINED big_obj_compile_option
PROPERTIES COMPILE_OPTIONS ${big_obj_compile_option}
)
if(big_obj_compile_option AND TARGET ClangCodeModel)
set_property(TARGET ClangCodeModel
APPEND PROPERTY COMPILE_OPTIONS ${big_obj_compile_option})
endif()

1
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -2781,6 +2781,7 @@ void ClangdClient::Private::handleSemanticTokens(TextDocument *doc,
<< version << q->documentVersion(doc->filePath());
return;
}
force = force || isTesting;
const auto previous = previousTokens.find(doc);
if (previous != previousTokens.end()) {
if (!force && previous->first == tokens && previous->second == version) {