From c802a1b12a47fe5023f29d32a72aaddd872d380b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 5 Dec 2019 15:28:42 +0100
Subject: [PATCH] Qmake: Set QmakeBuildConfig aspect values more directly

Change-Id: I759371e4f71cd4270f1bf82152ceb2f851c3c06b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../qmakeprojectmanager/qmakebuildconfiguration.cpp   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 69bc52f7fcf..ff7cbf911ce 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -178,14 +178,9 @@ void QmakeBuildConfiguration::initialize()
     if (!additionalArguments.isEmpty())
         qmakeStep->setUserArguments(additionalArguments);
 
-    if (qmakeExtra.config.separateDebugInfo == TriState::Enabled)
-        forceSeparateDebugInfo(true);
-
-    if (qmakeExtra.config.linkQmlDebuggingQQ2 != TriState::Default)
-        forceQmlDebugging(qmakeExtra.config.linkQmlDebuggingQQ2 == TriState::Enabled);
-
-    if (qmakeExtra.config.useQtQuickCompiler != TriState::Default)
-        forceQtQuickCompiler(qmakeExtra.config.useQtQuickCompiler == TriState::Enabled);
+    aspect<SeparateDebugInfoAspect>()->setSetting(qmakeExtra.config.separateDebugInfo);
+    aspect<QmlDebuggingAspect>()->setSetting(qmakeExtra.config.linkQmlDebuggingQQ2);
+    aspect<QtQuickCompilerAspect>()->setSetting(qmakeExtra.config.useQtQuickCompiler);
 
     setQMakeBuildConfiguration(config);