diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2019-07-12 15:53:56 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2019-07-12 15:53:56 +0200 |
| commit | 333b33edbe9805e00772c68c7a7f47c8394b786b (patch) | |
| tree | bcf4f598ce58b3b99ae103e6f2d4ef12c790b84b /qbs | |
| parent | f7520b7d991c34b3d8e3d1d726dc0b606f32c835 (diff) | |
| parent | 51cd2885ef56d43b8f421046fab6e5f85f8e6484 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Change-Id: Iaf27911e4e9fb762c1a24c84c458462bafe95728
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 4a0d6cab1d..f44aa86af4 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -3,8 +3,15 @@ import qbs.FileInfo Module { Depends { name: "qtc" } + Depends { name: "cpp" } - property bool priority: 1 // TODO: Remove declaration after 1.11 is out. + 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"] + } + + priority: 1 property bool enableUnitTests: false property bool enableProjectFileUpdates: true |