forked from qt-creator/qt-creator
Update qbs submodule to HEAD of 2.0 branch
Change-Id: If53431a0cf8bf412a28e606b0712e0acb26e07f5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -6,15 +6,21 @@ Module {
|
|||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang")
|
condition: qbs.toolchain.contains("gcc")
|
||||||
&& Utilities.versionCompare(cpp.compilerVersion, "9") >= 0
|
cpp.cxxFlags: {
|
||||||
cpp.cxxFlags: ["-Wno-deprecated-copy", "-Wno-init-list-lifetime"]
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
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"]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
priority: 1
|
priority: 1
|
||||||
|
Submodule src/shared/qbs updated: 03b0537a79...087c22e177
@@ -30,6 +30,7 @@ Project {
|
|||||||
qbsBaseDir + "/src/lib/libs.qbs",
|
qbsBaseDir + "/src/lib/libs.qbs",
|
||||||
qbsBaseDir + "/src/libexec/libexec.qbs",
|
qbsBaseDir + "/src/libexec/libexec.qbs",
|
||||||
qbsBaseDir + "/src/plugins/plugins.qbs",
|
qbsBaseDir + "/src/plugins/plugins.qbs",
|
||||||
|
qbsBaseDir + "/src/shared/quickjs/quickjs.qbs",
|
||||||
qbsBaseDir + "/share/share.qbs",
|
qbsBaseDir + "/share/share.qbs",
|
||||||
qbsBaseDir + "/src/app/apps.qbs",
|
qbsBaseDir + "/src/app/apps.qbs",
|
||||||
qbsBaseDir + "/src/shared/bundledqt/bundledqt.qbs",
|
qbsBaseDir + "/src/shared/bundledqt/bundledqt.qbs",
|
||||||
|
Reference in New Issue
Block a user