From adf97c4b70971c43c003aba1460a3542e5e6310c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 25 Feb 2022 15:20:42 +0100
Subject: [PATCH] QbsProjectManager: Consider cpp.cFlags and cpp.cxxFlags

Amends 0dc87382e9.

Change-Id: Idb65fb3ab5a528c4cb2ad7a49a9ef02c0ab09dc7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp | 2 ++
 src/plugins/qbsprojectmanager/qbssession.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 15ab9e87644..1ce9752f9f4 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -792,6 +792,8 @@ static void getExpandedCompilerFlags(QStringList &cFlags, QStringList &cxxFlags,
                 commonFlags << "-fPIC";
         }
         cFlags = cxxFlags = commonFlags;
+        cFlags << arrayToStringList(getCppProp("cFlags"));
+        cxxFlags << arrayToStringList(getCppProp("cxxFlags"));
 
         const auto cxxLanguageVersion = arrayToStringList(getCppProp("cxxLanguageVersion"));
         if (cxxLanguageVersion.contains("c++23"))
diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp
index 94bb7899bfd..8739bed7b3b 100644
--- a/src/plugins/qbsprojectmanager/qbssession.cpp
+++ b/src/plugins/qbsprojectmanager/qbssession.cpp
@@ -381,7 +381,9 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request)
         "cpp.commonCompilerFlags",
         "cpp.compilerVersionMajor",
         "cpp.compilerVersionMinor",
+        "cpp.cFlags",
         "cpp.cLanguageVersion",
+        "cpp.cxxFlags",
         "cpp.cxxLanguageVersion",
         "cpp.cxxStandardLibrary",
         "cpp.defines",