From 2f0b7996d23d984e7f240a1becf4182c126328e3 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 4 Oct 2024 14:06:15 +0200 Subject: [PATCH] ProjectExplorer: Use the same name for all "none" entries ... in the kit aspects. Task-number: QTCREATORBUG-31574 Change-Id: If6a7238be7e3297cfa796a5901fe2d4be295d543 Reviewed-by: hjk --- src/plugins/projectexplorer/toolchainkitaspect.cpp | 2 +- src/plugins/projectexplorer/toolchainoptionspage.cpp | 2 +- src/plugins/qtsupport/qtoptionspage.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/toolchainkitaspect.cpp b/src/plugins/projectexplorer/toolchainkitaspect.cpp index 178eaa000eb..631a1cbccdd 100644 --- a/src/plugins/projectexplorer/toolchainkitaspect.cpp +++ b/src/plugins/projectexplorer/toolchainkitaspect.cpp @@ -39,7 +39,7 @@ public: QModelIndex indexForBundleId(Id bundleId) const { if (!bundleId.isValid()) - return index(rowCount() - 1, 0); // The "no compiler" item always comes last + return index(rowCount() - 1, 0); // The "none" item always comes last const TreeItem *const item = findItemAtLevel<1>( [bundleId](TreeItem *item) { const auto tcItem = static_cast(item); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 4c3a29177bf..1d017f0efbd 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -51,7 +51,7 @@ QVariant ToolchainTreeItem::data(int column, int role) const switch (role) { case Qt::DisplayRole: if (column == 0) - return bundle ? bundle->displayName() : Tr::tr(""); + return bundle ? bundle->displayName() : Tr::tr("None"); return bundle->typeDisplayName(); case Qt::ToolTipRole: { if (!bundle) diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 5ba6ff5c67a..95b8d19a9c7 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -166,7 +166,7 @@ QVariant QtVersionItem::data(int column, int role) const if (!version) { if (role == Qt::DisplayRole && column == 0) - return Tr::tr("No Qt"); + return Tr::tr("None"); if (role == IdRole) return -1; return TreeItem::data(column, role);