feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Use the same name for all "none" entries

Browse Source 
... in the kit aspects.

Task-number: QTCREATORBUG-31574
Change-Id: If6a7238be7e3297cfa796a5901fe2d4be295d543
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2024-10-04 14:06:15 +02:00
parent 58d3fc18db
commit 2f0b7996d2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/toolchainkitaspect.cpp
View File

@@ -39,7 +39,7 @@ public:
QModelIndex indexForBundleId(Id bundleId) const QModelIndex indexForBundleId(Id bundleId) const
{ {
if (!bundleId.isValid()) 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>( const TreeItem *const item = findItemAtLevel<1>(
[bundleId](TreeItem *item) { [bundleId](TreeItem *item) {
const auto tcItem = static_cast<ToolchainTreeItem *>(item); const auto tcItem = static_cast<ToolchainTreeItem *>(item);

2
src/plugins/projectexplorer/toolchainoptionspage.cpp
View File

@@ -51,7 +51,7 @@ QVariant ToolchainTreeItem::data(int column, int role) const
switch (role) { switch (role) {
case Qt::DisplayRole: case Qt::DisplayRole:
if (column == 0) if (column == 0)
return bundle ? bundle->displayName() : Tr::tr("<No toolchain>"); return bundle ? bundle->displayName() : Tr::tr("None");
return bundle->typeDisplayName(); return bundle->typeDisplayName();
case Qt::ToolTipRole: { case Qt::ToolTipRole: {
if (!bundle) if (!bundle)

2
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -166,7 +166,7 @@ QVariant QtVersionItem::data(int column, int role) const
if (!version) { if (!version) {
if (role == Qt::DisplayRole && column == 0) if (role == Qt::DisplayRole && column == 0)
return Tr::tr("No Qt"); return Tr::tr("None");
if (role == IdRole) if (role == IdRole)
return -1; return -1;
return TreeItem::data(column, role); return TreeItem::data(column, role);