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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp

Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
This commit is contained in:
Eike Ziller
2019-09-12 09:08:04 +02:00
parent 3a5ca31a7e a21df46481
commit 8df0653bf8
39 changed files with 234 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -469,7 +469,7 @@ void LanguageClientManager::documentContentsSaved(Core::IDocument *document)
void LanguageClientManager::documentWillSave(Core::IDocument *document)
{
for (Client *interface : reachableClients())
interface->documentContentsSaved(document);
interface->documentWillSave(document);
}
void LanguageClientManager::findLinkAt(const Utils::FilePath &filePath,
@@ -546,7 +546,7 @@ void LanguageClientManager::findUsages(const Utils::FilePath &filePath, const QT
ReferenceParams params(TextDocumentPositionParams(document, pos));
params.setContext(ReferenceParams::ReferenceContext(true));
FindReferencesRequest request(params);
auto callback = [wordUnderCursor = termCursor.selectedText()]
auto callback = [this, wordUnderCursor = termCursor.selectedText()]
(const QString &clientName, const FindReferencesRequest::Response &response){
if (auto result = response.result()) {
Core::SearchResult *search = Core::SearchResultWindow::instance()->startNewSearch(