feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Consider cpp.cFlags and cpp.cxxFlags

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2022-02-25 15:20:42 +01:00
parent 22fb18c0a8
commit adf97c4b70
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -792,6 +792,8 @@ static void getExpandedCompilerFlags(QStringList &cFlags, QStringList &cxxFlags,
commonFlags << "-fPIC"; commonFlags << "-fPIC";
} }
cFlags = cxxFlags = commonFlags; cFlags = cxxFlags = commonFlags;
cFlags << arrayToStringList(getCppProp("cFlags"));
cxxFlags << arrayToStringList(getCppProp("cxxFlags"));
const auto cxxLanguageVersion = arrayToStringList(getCppProp("cxxLanguageVersion")); const auto cxxLanguageVersion = arrayToStringList(getCppProp("cxxLanguageVersion"));
if (cxxLanguageVersion.contains("c++23")) if (cxxLanguageVersion.contains("c++23"))

2
src/plugins/qbsprojectmanager/qbssession.cpp
View File

@@ -381,7 +381,9 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request)
"cpp.commonCompilerFlags", "cpp.commonCompilerFlags",
"cpp.compilerVersionMajor", "cpp.compilerVersionMajor",
"cpp.compilerVersionMinor", "cpp.compilerVersionMinor",
"cpp.cFlags",
"cpp.cLanguageVersion", "cpp.cLanguageVersion",
"cpp.cxxFlags",
"cpp.cxxLanguageVersion", "cpp.cxxLanguageVersion",
"cpp.cxxStandardLibrary", "cpp.cxxStandardLibrary",
"cpp.defines", "cpp.defines",