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

HelpItem: Fix usage of isFuzzyMatch

Browse Source 
We may not access that before links are resolved.

Change-Id: I5e80190e41c220c6b70e5d391caaf173cd5b28d8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2019-02-12 13:06:02 +01:00
parent e985290444
commit 1ac9a91811
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/helpitem.cpp
View File

@@ -270,7 +270,7 @@ static const HelpItem::Links getBestLink(const HelpItem::Links &links)
const HelpItem::Links HelpItem::bestLinks() const const HelpItem::Links HelpItem::bestLinks() const
{ {
if (m_isFuzzyMatch) if (isFuzzyMatch())
return getBestLinks(links()); return getBestLinks(links());
return getBestLink(links()); return getBestLink(links());
} }
@@ -279,3 +279,10 @@ const QString HelpItem::keyword() const
{ {
return m_keyword; return m_keyword;
} }
bool HelpItem::isFuzzyMatch() const
{
// make sure m_isFuzzyMatch is correct
links();
return m_isFuzzyMatch;
}

2
src/plugins/coreplugin/helpitem.h
View File

@@ -86,6 +86,8 @@ public:
const QString keyword() const; const QString keyword() const;
private: private:
bool isFuzzyMatch() const;
QUrl m_helpUrl; QUrl m_helpUrl;
QStringList m_helpIds; QStringList m_helpIds;
QString m_docMark; QString m_docMark;