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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
This commit is contained in:
Friedemann Kleint
2010-08-06 10:46:50 +02:00
parent 077c918186 9bad0c01be
commit 7e739985b2
24 changed files with 316 additions and 4399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/help/helpplugin.cpp
View File

@@ -942,12 +942,13 @@ void HelpPlugin::highlightSearchTerms()
if (name.isEmpty())
continue;
if (m_oldAttrValue == name) {
if (m_oldAttrValue == name
|| name.startsWith(m_oldAttrValue + QLatin1Char('-'))) {
QWebElement parent = element.parent();
parent.setStyleProperty(property, m_styleProperty);
}
if (attrValue == name) {
if (attrValue == name || name.startsWith(attrValue + QLatin1Char('-'))) {
QWebElement parent = element.parent();
m_styleProperty = parent.styleProperty(property,
QWebElement::InlineStyle);
@@ -956,7 +957,6 @@ void HelpPlugin::highlightSearchTerms()
}
m_oldAttrValue = attrValue;
#endif
viewer->findText(m_idFromContext, 0, false, true);
}
}