diff options
author | Eike Ziller <eike.ziller@qt.io> | 2021-10-25 13:39:26 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2021-10-25 13:39:26 +0200 |
commit | 24dc33adb8d6d4616ad845fe9ebaeba2dd0b3d29 (patch) | |
tree | c99b6b8dba19f2ac544b3bcd5c8b7a6a99e0829c | |
parent | f5fbfef50b6ce588d9be49c730a2568f235a6e6e (diff) | |
parent | 4a83e40a4648ca1eaf304cb289ea786e55539df2 (diff) |
Merge remote-tracking branch 'origin/5.0' into 6.0v6.0.2v6.0.1v6.0.0-rc1v6.0.0-beta2v6.0.0
Change-Id: I4b71f1ca8797e21bbbc8d1e2a1a21dac0b6d59ec
-rw-r--r-- | .gitmodules | 2 | ||||
m--------- | 3rdparty/kuserfeedback | 0 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/datasources/examplesdatasource.cpp | 10 | ||||
-rw-r--r-- | src/datasources/examplesdatasource.h | 2 | ||||
-rw-r--r-- | src/ui/usagestatisticwidget.cpp | 2 | ||||
-rw-r--r-- | src/usagestatisticplugin.cpp | 5 |
7 files changed, 14 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 8a90637..f91662e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "3rdparty/kuserfeedback"] path = 3rdparty/kuserfeedback - url = https://git.qt.io/aportale/kuserfeedback.git + url = https://invent.kde.org/kkoehne/kuserfeedback.git [submodule "3rdparty/extra-cmake-modules"] path = 3rdparty/extra-cmake-modules url = https://github.com/KDE/extra-cmake-modules.git diff --git a/3rdparty/kuserfeedback b/3rdparty/kuserfeedback -Subproject bb633832b0fd0ff2e04dfd6607abbfba9c4ae8e +Subproject 80cdb0c4659a9e764ef0b909b956d1429a43bc6 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e2a3cd..71958ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,10 +20,10 @@ ExternalProject_Add(extra-cmake-modules set(KUSERFEEDBACK_COMPONENTS -DBUILD_SHARED_LIBS=OFF + -DBUILD_TESTING=OFF -DENABLE_SURVEY_TARGET_EXPRESSIONS=OFF -DENABLE_PHP=OFF -DENABLE_PHP_UNIT=OFF - -DENABLE_TESTING=OFF -DENABLE_DOCS=OFF -DENABLE_CONSOLE=OFF -DENABLE_CLI=OFF diff --git a/src/datasources/examplesdatasource.cpp b/src/datasources/examplesdatasource.cpp index 0ff454e..0682e7b 100644 --- a/src/datasources/examplesdatasource.cpp +++ b/src/datasources/examplesdatasource.cpp @@ -71,19 +71,19 @@ static QString examplesKey() { return QStringLiteral("examples"); } QVariant ExamplesDataSource::data() { - return QVariantMap{{examplesKey(), QVariant(m_examplePaths.toList())}}; + return QVariantMap{{examplesKey(), QVariant(m_examplePaths)}}; } void ExamplesDataSource::loadImpl(QSettings *settings) { auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings); - m_examplePaths = settings->value(examplesKey()).toStringList().toSet(); + m_examplePaths = settings->value(examplesKey()).toStringList(); } void ExamplesDataSource::storeImpl(QSettings *settings) { auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings); - settings->setValue(examplesKey(), QStringList(m_examplePaths.toList())); + settings->setValue(examplesKey(), QStringList(m_examplePaths)); } void ExamplesDataSource::resetImpl(QSettings *settings) @@ -107,7 +107,9 @@ void ExamplesDataSource::updateOpenedExamples() auto projectPath = QDir::fromNativeSeparators(project->projectFilePath().toString()); const auto match = re.match(projectPath); if (match.hasMatch()) { - m_examplePaths << match.captured(examplePathGroupName()); + QString sanitizedPath = match.captured(examplePathGroupName()); + if (!m_examplePaths.contains(sanitizedPath)) + m_examplePaths.append(sanitizedPath); } } } diff --git a/src/datasources/examplesdatasource.h b/src/datasources/examplesdatasource.h index 19b5779..be48a6b 100644 --- a/src/datasources/examplesdatasource.h +++ b/src/datasources/examplesdatasource.h @@ -62,7 +62,7 @@ private: // Methods void updateOpenedExamples(); private: // Data - QSet<QString> m_examplePaths; + QList<QString> m_examplePaths; }; } // namespace Internal diff --git a/src/ui/usagestatisticwidget.cpp b/src/ui/usagestatisticwidget.cpp index b6f7a3b..c13821c 100644 --- a/src/ui/usagestatisticwidget.cpp +++ b/src/ui/usagestatisticwidget.cpp @@ -192,7 +192,7 @@ void UsageStatisticWidget::addPrivacyPolicyLink() { const auto currentText = ui->lblPrivacyPolicy->text(); const auto linkTemplate = QString("<a href=\"%1\">%2<\\a>"); - ui->lblPrivacyPolicy->setText(linkTemplate.arg(Constants::PRIVACY_POLICY_URL, currentText)); + ui->lblPrivacyPolicy->setText(linkTemplate.arg(QLatin1String(Constants::PRIVACY_POLICY_URL), currentText)); const auto tooltipTemplate = tr("Open %1"); ui->lblPrivacyPolicy->setToolTip(tooltipTemplate.arg(Constants::PRIVACY_POLICY_URL)); diff --git a/src/usagestatisticplugin.cpp b/src/usagestatisticplugin.cpp index daaedac..d2aa70b 100644 --- a/src/usagestatisticplugin.cpp +++ b/src/usagestatisticplugin.cpp @@ -25,6 +25,8 @@ #include "usagestatisticplugin.h" #include "usagestatisticconstants.h" +#include <app/app_version.h> + #include <coreplugin/icore.h> #include <coreplugin/icontext.h> #include <coreplugin/actionmanager/actionmanager.h> @@ -215,7 +217,8 @@ void UsageStatisticPlugin::showFirstTimeMessage() static ::Utils::InfoBarEntry makeInfoBarEntry() { static auto infoText = UsageStatisticPlugin::tr( - "We make Qt Creator for you. Would you like to help us make it even better?"); + "We make %1 for you. Would you like to help us make it even better?") + .arg(Core::Constants::IDE_DISPLAY_NAME); static auto customButtonInfoText = UsageStatisticPlugin::tr("Adjust usage statistics settings"); static auto cancelButtonInfoText = UsageStatisticPlugin::tr("Decide later"); |