From 1ac9a91811e2392cf775952805a92ed4e53d4c88 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 12 Feb 2019 13:06:02 +0100
Subject: [PATCH] HelpItem: Fix usage of isFuzzyMatch

We may not access that before links are resolved.

Change-Id: I5e80190e41c220c6b70e5d391caaf173cd5b28d8
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/coreplugin/helpitem.cpp | 9 ++++++++-
 src/plugins/coreplugin/helpitem.h   | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/plugins/coreplugin/helpitem.cpp b/src/plugins/coreplugin/helpitem.cpp
index b8794481cfe..d63bd883dea 100644
--- a/src/plugins/coreplugin/helpitem.cpp
+++ b/src/plugins/coreplugin/helpitem.cpp
@@ -270,7 +270,7 @@ static const HelpItem::Links getBestLink(const HelpItem::Links &links)
 
 const HelpItem::Links HelpItem::bestLinks() const
 {
-    if (m_isFuzzyMatch)
+    if (isFuzzyMatch())
         return getBestLinks(links());
     return getBestLink(links());
 }
@@ -279,3 +279,10 @@ const QString HelpItem::keyword() const
 {
     return m_keyword;
 }
+
+bool HelpItem::isFuzzyMatch() const
+{
+    // make sure m_isFuzzyMatch is correct
+    links();
+    return m_isFuzzyMatch;
+}
diff --git a/src/plugins/coreplugin/helpitem.h b/src/plugins/coreplugin/helpitem.h
index 4d9ab153fb8..15ff585ca82 100644
--- a/src/plugins/coreplugin/helpitem.h
+++ b/src/plugins/coreplugin/helpitem.h
@@ -86,6 +86,8 @@ public:
     const QString keyword() const;
 
 private:
+    bool isFuzzyMatch() const;
+
     QUrl m_helpUrl;
     QStringList m_helpIds;
     QString m_docMark;