From b903655ebc7af0055e3df6d2fc3268809c6d974f Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Tue, 1 Dec 2020 14:45:10 +0200 Subject: Open the top treeview item after pressing 'Filter' Topmost treeview item should be open by default, but this was not the case after categories were fetched. Task-number: QTIFW-2058 Change-Id: If64126623bd7b783524b8bd16771ede574be3b97 Reviewed-by: Iikka Eklund Reviewed-by: Arttu Tarkiainen --- src/libs/installer/componentselectionpage_p.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libs/installer') diff --git a/src/libs/installer/componentselectionpage_p.cpp b/src/libs/installer/componentselectionpage_p.cpp index c5117e9cb..6d3300081 100644 --- a/src/libs/installer/componentselectionpage_p.cpp +++ b/src/libs/installer/componentselectionpage_p.cpp @@ -415,6 +415,7 @@ void ComponentSelectionPagePrivate::fetchRepositoryCategories() QLatin1String("FailToFetchPackages"), tr("Error"), m_core->error()); } updateWidgetVisibility(false); + updateTreeView(); } void ComponentSelectionPagePrivate::customButtonClicked(int which) -- cgit v1.2.3 From a00146cbcf207b97bf2bbba7544290293f6d167e Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Mon, 11 Jan 2021 09:03:13 +0100 Subject: Don't call toLower() when using the lang for finding the license file By calling toLower() it will go against what the expected format is for a language such as zh-CN and as a result not find the license file which is matching this language. Change-Id: Ibdf7d57d3d2761db7b68edcabf5599b9404f3b7e Reviewed-by: Katja Marttila --- src/libs/installer/component.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libs/installer') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 16b417b02..5c74a2139 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -661,7 +661,7 @@ void Component::loadLicenses(const QString &directory, const QHash fileCandidates; - foreach (const QString &locale, QInstaller::localeCandidates(lang.toLower())) { + foreach (const QString &locale, QInstaller::localeCandidates(lang)) { fileCandidates << QFileInfo(QString::fromLatin1("%1%2_%3.%4").arg( directory, fileInfo.baseName(), locale, fileInfo.completeSuffix())); -- cgit v1.2.3