diff options
author | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-10-17 09:24:50 +0200 |
---|---|---|
committer | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2023-10-17 09:24:22 +0000 |
commit | e13c1a1239a02379da0e16fd5f9a73f0b877285f (patch) | |
tree | 39b38dd224c45de0c9be9f68aecee272b08a1228 /src/plugins/compilerexplorer | |
parent | effe73024f6c81aec83ddea4758f35a2533ac2f5 (diff) |
CompilerExplorer: Fix display of selected library
Change-Id: I44085ef914930a16f14a2fc79e2941852dc2e4fb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/compilerexplorer')
-rw-r--r-- | src/plugins/compilerexplorer/compilerexploreraspects.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/plugins/compilerexplorer/compilerexploreraspects.cpp b/src/plugins/compilerexplorer/compilerexploreraspects.cpp index 0ba5da377d6..cf02893d770 100644 --- a/src/plugins/compilerexplorer/compilerexploreraspects.cpp +++ b/src/plugins/compilerexplorer/compilerexploreraspects.cpp @@ -189,10 +189,20 @@ void LibrarySelectionAspect::addToLayout(Layouting::LayoutItem &parent) QStringList libs; for (int i = 0; i < m_model->rowCount(); i++) { QModelIndex idx = m_model->index(i, 0); - if (idx.data(SelectedVersion).isValid()) { - libs.append(QString("%1 %2") - .arg(idx.data().toString()) - .arg(idx.data(SelectedVersion).toString())); + if (idx.data(LibraryData).isValid() && idx.data(SelectedVersion).isValid()) { + auto libData = idx.data(LibraryData).value<Api::Library>(); + auto id = idx.data(SelectedVersion).toString(); + + auto versionIt = std::find_if(libData.versions.begin(), + libData.versions.end(), + [id](const Api::Library::Version &v) { + return v.id == id; + }); + const QString versionName = versionIt == libData.versions.end() + ? id + : versionIt->version; + + libs.append(QString("%1 %2").arg(libData.name).arg(versionName)); } } if (libs.empty()) |