diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-05-03 11:44:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-05-03 11:44:55 +0200 |
| commit | 9f303234d3bed1770d8b8fd17deb209d19eac1b7 (patch) | |
| tree | 3fa994e1abae6beeada4d492e0b7b32b556f5165 /qbs-resources | |
| parent | a16582bd37475773f6c5ba7f1f643484cf5c3271 (diff) | |
| parent | 5c9171ca2ef5bc538967c29246d5f35bf01cfea7 (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
src/lib/corelib/jsextensions/environmentextension.cpp
src/lib/corelib/language/scriptengine.h
Change-Id: I77e4626218612656d0963d1bfc643d9f9e7f4edd
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsProduct.qbs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs index 094013f61..de5f7f12a 100644 --- a/qbs-resources/imports/QbsProduct.qbs +++ b/qbs-resources/imports/QbsProduct.qbs @@ -4,6 +4,12 @@ import QbsFunctions Product { Depends { name: "Qt.core" } property string minimumQtVersion: "5.1.0" - cpp.defines: ["QT_NO_CAST_FROM_ASCII", "QT_NO_PROCESS_COMBINED_ARGUMENT_START"] + cpp.defines: { + var res = ["QT_NO_CAST_FROM_ASCII", "QT_NO_PROCESS_COMBINED_ARGUMENT_START"]; + if (qbs.toolchain.contains("msvc")) + res.push("_SCL_SECURE_NO_WARNINGS"); + return res; + } + cpp.enableExceptions: true condition: QbsFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) } |