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

7
src/plugins/cpptools/cpplocatorfilter.cpp
View File

@@ -106,7 +106,12 @@ QList<Core::LocatorFilterEntry> CppLocatorFilter::matchesFor(
matchOffset = 0;
}
filterEntry.highlightInfo = highlightInfo(match);
if (matchOffset > 0) {
if (matchInParameterList && filterEntry.highlightInfo.starts.isEmpty()) {
match = regexp.match(filterEntry.extraInfo);
filterEntry.highlightInfo = highlightInfo(match);
filterEntry.highlightInfo.dataType =
Core::LocatorFilterEntry::HighlightInfo::ExtraInfo;
} else if (matchOffset > 0) {
for (int &start : filterEntry.highlightInfo.starts)
start -= matchOffset;
}