diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index d3b2cafa1c3..eca4f33508e 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -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
diff --git a/src/shared/qbs b/src/shared/qbs
index 03b0537a79b..087c22e1772 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 03b0537a79b3050dc0e70b6f4086f513f9b87e6d
+Subproject commit 087c22e17721f37490dd2048a567b6a58065d939
diff --git a/src/src.qbs b/src/src.qbs
index 8d50dafdc10..b59d8843236 100644
--- a/src/src.qbs
+++ b/src/src.qbs
@@ -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",