diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-30 21:44:13 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-10-30 21:44:13 +0200 |
| commit | 0b76a8864ccf1ff900ed983dc385ed928061ea58 (patch) | |
| tree | d00fea6b6aa192a1a64a93d14ec3c265bb55799a /qbs | |
| parent | 30d123e2ecf7717c7d4f2dc2dcca1856abb239d5 (diff) | |
| parent | be673acb3e262aaac1e868e145c6bc595e72ac79 (diff) | |
Merge remote-tracking branch 'origin/4.5'
Change-Id: I7bc3615fb4bbafffa9636d731d8840445352b592
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index ea9fb30163..c6b130effe 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -26,6 +26,10 @@ Product { cpp.minimumMacosVersion: project.minimumMacosVersion } + Properties { + condition: qbs.toolchain.contains("gcc") && !qbs.toolchain.contains("clang") + cpp.cxxFlags: base.concat(["-Wno-noexcept-type"]) + } cpp.cxxLanguageVersion: "c++14" cpp.defines: qtc.generalDefines cpp.minimumWindowsVersion: qbs.architecture === "x86" ? "5.1" : "5.2" |