CMakePM: Refactor "Initial Parameters" as a tab bar item

Now we have "Initial Configuration" and "Current Configuration"
as tab bar buttons.

This way the UI can be shared between the two configuration states.

Task-number: QTCREATORBUG-26869
Change-Id: I8206032a2a5ac076629865057816edb99706f2ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
index 1ef1215d22..048dead9d2 100644
--- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp
+++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp
@@ -59,11 +59,14 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
                                                            });
     initialCMakeArguments = Utils::filtered(expandedArguments,
                                             [](const QString &s) { return !s.isEmpty(); });
-    extraCMakeArguments = Utils::transform(bc->configurationChangesArguments(),
-                                             [expander](const QString &s) {
-                                                 return expander->expand(s);
-                                             });
-
+    configurationChangesArguments = Utils::transform(bc->configurationChangesArguments(),
+                                                     [expander](const QString &s) {
+                                                         return expander->expand(s);
+                                                     });
+    additionalCMakeArguments = Utils::transform(bc->additionalCMakeArguments(),
+                                                [expander](const QString &s) {
+                                                    return expander->expand(s);
+                                                });
     const Target *t = bc->target();
     const Kit *k = t->kit();
     const Project *p = t->project();