Merge remote-tracking branch 'origin/7.0'

Change-Id: If390b9264dba14c6c71752a0de84ab7ff881b2c5
2022-03-01 08:59:05 +01:00
parent 0dfcc97a3e 0803390a83
commit 4cb04ad798
118 changed files with 639 additions and 486 deletions
--- a/src/plugins/qbsprojectmanager/qbssession.cpp
+++ b/src/plugins/qbsprojectmanager/qbssession.cpp
@@ -384,7 +384,9 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request)
        "cpp.commonCompilerFlags",
        "cpp.compilerVersionMajor",
        "cpp.compilerVersionMinor",
+        "cpp.cFlags",
        "cpp.cLanguageVersion",
+        "cpp.cxxFlags",
        "cpp.cxxLanguageVersion",
        "cpp.cxxStandardLibrary",
        "cpp.defines",