Merge remote-tracking branch 'origin/4.10'

 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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index bfc93c7e531..000091bde47 100644
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -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;
                 }