Merge remote-tracking branch 'origin/5.15' into dev

Conflicts:
  a bunch of .pro and configure.json file adjustments
  and some conflicting cherry-picks from dev -> 5.15
  that are merged into dev again

  src/assistant/assistant/main.cpp

Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2

1 files changed, 7 insertions, 5 deletions

diff --git a/src/assistant/assistant/topicchooser.cpp b/src/assistant/assistant/topicchooser.cpp
index d058646c5..ec9faddb6 100644
--- a/src/assistant/assistant/topicchooser.cpp
+++ b/src/assistant/assistant/topicchooser.cpp
@@ -35,9 +35,11 @@
 #include <QSortFilterProxyModel>
 #include <QUrl>
 
+#include <QtHelp/QHelpLink>
+
 QT_BEGIN_NAMESPACE
 
-TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, const QMap<QString, QUrl> &links)
+TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, const QList<QHelpLink> &docs)
     : QDialog(parent)
     , m_filterModel(new QSortFilterProxyModel(this))
 {
@@ -53,10 +55,10 @@ TopicChooser::TopicChooser(QWidget *parent, const QString &keyword, const QMap<Q
     m_filterModel->setSourceModel(model);
     m_filterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
 
-    for (auto it = links.cbegin(), end = links.cend(); it != end; ++it) {
-        m_links.append(it.value());
-        QStandardItem *item = new QStandardItem(it.key());
-        item->setToolTip(it.value().toString());
+    for (const auto &doc : docs) {
+        m_links.append(doc.url);
+        QStandardItem *item = new QStandardItem(doc.title);
+        item->setToolTip(doc.url.toString());
         model->appendRow(item);
     }