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

Update qbs submodule to HEAD of 2.0 branch

Browse Source 
Change-Id: If53431a0cf8bf412a28e606b0712e0acb26e07f5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2023-02-07 10:56:45 +01:00
parent 78cf3eb671
commit 8096b9f524
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
View File

@@ -6,15 +6,21 @@ Module {
Depends { name: "cpp" }
Properties {
condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
&& Utilities.versionCompare(cpp.compilerVersion, "9") >= 0
cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"]
}
Properties {
condition: qbs.toolchain.contains("clang") && !qbs.hostOS.contains("darwin")
&& Utilities.versionCompare(cpp.compilerVersion, "10") >= 0
cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-constant-logical-operand"]
condition: qbs.toolchain.contains("gcc")
cpp.cxxFlags: {
var flags = ["-Wno-missing-field-initializers"];
function isClang() { return qbs.toolchain.contains("clang"); }
function versionAtLeast(v) {
return Utilities.versionCompare(cpp.compilerVersion, v) >= 0;
};
if (isClang())
flags.push("-Wno-constant-logical-operand");
if ((!isClang() && versionAtLeast("9"))
|| (isClang() && !qbs.hostOS.contains("darwin") && versionAtLeast("10"))) {
flags.push("-Wno-deprecated-copy");
}
return flags;
}
}
priority: 1

2
src/shared/qbs

Submodule src/shared/qbs updated: 03b0537a79...087c22e177

1
src/src.qbs
View File

@@ -30,6 +30,7 @@ Project {
qbsBaseDir + "/src/lib/libs.qbs",
qbsBaseDir + "/src/libexec/libexec.qbs",
qbsBaseDir + "/src/plugins/plugins.qbs",
qbsBaseDir + "/src/shared/quickjs/quickjs.qbs",
qbsBaseDir + "/share/share.qbs",
qbsBaseDir + "/src/app/apps.qbs",
qbsBaseDir + "/src/shared/bundledqt/bundledqt.qbs",