Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2018-04-28 12:19:10 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2018-04-28 12:19:10 (GMT) |
| commit | ae40d88f47c4f73b81d675b39a311eb6af8b03f3 (patch) | |
| tree | 721adb912eceece92f0a47a4109dc83d8023c000 /Swift/QtUI | |
| parent | c9d97d5acf4a158c6129d72e491580c29b54322b (diff) | |
| download | swift-ae40d88f47c4f73b81d675b39a311eb6af8b03f3.zip swift-ae40d88f47c4f73b81d675b39a311eb6af8b03f3.tar.bz2 | |
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
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
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"]) |