1 files changed, 13 insertions, 15 deletions
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index ecfe09d71..fe92caba9 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -41,6 +41,7 @@
 
 #include "artifactproperties.h"
 #include "builtindeclarations.h"
+#include "productitemmultiplexer.h"
 #include "propertymapinternal.h"
 #include "scriptengine.h"
 
@@ -60,6 +61,7 @@
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
 #include <tools/scripttools.h>
+#include <tools/setupprojectparameters.h>
 #include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
@@ -423,18 +425,9 @@ QString ResolvedProduct::uniqueName() const
     return uniqueName(name, multiplexConfigurationId);
 }
 
-QString ResolvedProduct::fullDisplayName(const QString &name,
-                                         const QString &multiplexConfigurationId)
-{
-    QString result = name;
-    if (!multiplexConfigurationId.isEmpty())
-        result.append(QLatin1Char(' ')).append(multiplexIdToString(multiplexConfigurationId));
-    return result;
-}
-
 QString ResolvedProduct::fullDisplayName() const
 {
-    return fullDisplayName(name, multiplexConfigurationId);
+    return ProductItemMultiplexer::fullProductDisplayName(name, multiplexConfigurationId);
 }
 
 QString ResolvedProduct::profile() const
@@ -617,6 +610,16 @@ void TopLevelProject::makeModuleProvidersNonTransient()
         m.transientOutput = false;
 }
 
+QVariantMap TopLevelProject::fullProfileConfigsTree() const
+{
+    QVariantMap tree;
+    for (auto it = profileConfigs.cbegin(); it != profileConfigs.cend(); ++it) {
+        tree.insert(it.key(), SetupProjectParameters::finalBuildConfigurationTree(
+                                  it.value().toMap(), overriddenValues));
+    }
+    return tree;
+}
+
 QString TopLevelProject::buildGraphFilePath() const
 {
     return ProjectBuildData::deriveBuildGraphFilePath(buildDirectory, id());
@@ -913,11 +916,6 @@ bool artifactPropertyListsAreEqual(const std::vector<ArtifactPropertiesPtr> &l1,
     return listsAreEqual(l1, l2);
 }
 
-QString multiplexIdToString(const QString &id)
-{
-    return QString::fromUtf8(QByteArray::fromBase64(id.toUtf8()));
-}
-
 bool operator==(const PrivateScriptFunction &a, const PrivateScriptFunction &b)
 {
     return equals(a.m_sharedData.get(), b.m_sharedData.get());