aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-07-28 17:10:36 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-08-03 07:22:57 +0000
commit91226f396c4080f34f7af1f09e5d301e17fa2ab8 (patch)
tree2951bfb233e6f03d5dc02ec92eff1829def1f6d0 /src/app
parent0a2f8da44f1c8aecb17c0352ad1585c93e599992 (diff)
Centralize conversion of multiplex id to human-readable string
... and use it to construct a unique product display name that can be used in error messages and so on. [ChangeLog][API] Introduced ProductData::fullDisplayName() Change-Id: I9a35765d3694a8f24741f1506b00d499a1aa23a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/app')
-rw-r--r--src/app/qbs/commandlinefrontend.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index 5e2c84e42..f2a0a5f96 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -551,15 +551,8 @@ void CommandLineFrontend::listProducts()
{
const QList<ProductData> products = productsToUse().begin().value();
QStringList output;
- for (const ProductData &p : products) {
- QString line = p.name();
- if (!p.multiplexConfigurationId().isEmpty()) {
- const QString humanReadableConfig = QString::fromUtf8(
- QByteArray::fromBase64(p.multiplexConfigurationId().toUtf8()));
- line += QLatin1Char(' ') + humanReadableConfig;
- }
- output += line;
- }
+ for (const ProductData &p : products)
+ output += p.fullDisplayName();
output.sort();
qbsInfo() << output.join(QLatin1Char('\n'));
}