From 0fa5303916a64cb4f62f2094bb9bcc24f1629ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Mon, 28 Feb 2022 21:34:13 +0100 Subject: [PATCH] Welcome: Replace search term when adding tags Currently, both are mixed into one so neither of them works. When both are separated with a space, the search term is ignored anyway so it's better to just remove it. Change-Id: I449b5d80dc50620f13f37c908e63877eb63b3c26 Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/marketplace/qtmarketplacewelcomepage.cpp | 5 +++-- src/plugins/qtsupport/gettingstartedwelcomepage.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp index 1abb06dacc9..bd1c112a56a 100644 --- a/src/plugins/marketplace/qtmarketplacewelcomepage.cpp +++ b/src/plugins/marketplace/qtmarketplacewelcomepage.cpp @@ -132,8 +132,9 @@ public: void onTagClicked(const QString &tag) { - QString text = m_searcher->text(); - m_searcher->setText(text + QString("tag:\"%1\" ").arg(tag)); + const QString text = m_searcher->text(); + m_searcher->setText((text.startsWith("tag:\"") ? text.trimmed() + " " : QString()) + + QString("tag:\"%1\" ").arg(tag)); } private: diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 93b630c3eb2..e163165f962 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -326,8 +326,9 @@ public: void onTagClicked(const QString &tag) { - QString text = m_searcher->text(); - m_searcher->setText(text + QString("tag:\"%1\" ").arg(tag)); + const QString text = m_searcher->text(); + m_searcher->setText((text.startsWith("tag:\"") ? text.trimmed() + " " : QString()) + + QString("tag:\"%1\" ").arg(tag)); } const bool m_isExamples;