From ae40d88f47c4f73b81d675b39a311eb6af8b03f3 Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Sat, 28 Apr 2018 13:19:10 +0100 Subject: Allow Qt to generate 0 as nullptr Without this, Qt-generated code can't be compiled allow_warnings=0 on macOS Test-Information: ./scons allow_warnings=0 Change-Id: Ifc9409f54ebd60dcfd2eef5d5619fc96e2a52e5f diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 4ff2d81..a61cbbf 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -24,7 +24,7 @@ myenv = env.Clone() # Disable warnings that affect Qt myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"]) if "clang" in env["CC"] : - myenv.Append(CXXFLAGS = ["-Wno-float-equal", "-Wno-shorten-64-to-32", "-Wno-missing-prototypes", "-Wno-unreachable-code", "-Wno-disabled-macro-expansion", "-Wno-unused-private-field", "-Wno-extra-semi", "-Wno-duplicate-enum", "-Wno-missing-variable-declarations", "-Wno-conversion", "-Wno-undefined-reinterpret-cast"]) + myenv.Append(CXXFLAGS = ["-Wno-float-equal", "-Wno-shorten-64-to-32", "-Wno-missing-prototypes", "-Wno-unreachable-code", "-Wno-disabled-macro-expansion", "-Wno-unused-private-field", "-Wno-extra-semi", "-Wno-duplicate-enum", "-Wno-missing-variable-declarations", "-Wno-conversion", "-Wno-undefined-reinterpret-cast", "-Wno-zero-as-null-pointer-constant"]) myenv.UseFlags(env["SWIFT_CONTROLLERS_FLAGS"]) myenv.UseFlags(env["SWIFTOOLS_FLAGS"]) -- cgit v0.10.2-6-g49f6