diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-21 19:04:28 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-22 08:00:52 +0000 |
| commit | f388e98a7f2043a01f15a9d4faaff5ab077fce6a (patch) | |
| tree | a5fe380f636f28ea1b500de533c0ad3c211799ff | |
| parent | 2372d29fbd0c31bb4e6c9cde749cbbdf9c735680 (diff) | |
| download | qbs-f388e98a7f2043a01f15a9d4faaff5ab077fce6a.tar.gz | |
Define QT_NO_PROCESS_COMBINED_ARGUMENT_START.
This will be present in Qt 5.6, and prevents use of dangerous overloads
of QProcess::start.
Change-Id: Ibd58091bcae1f326ab62ad14deef7a99138cdc6b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | qbs-resources/imports/QbsProduct.qbs | 2 | ||||
| -rw-r--r-- | src/lib/library.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs index 80fe5601d..094013f61 100644 --- a/qbs-resources/imports/QbsProduct.qbs +++ b/qbs-resources/imports/QbsProduct.qbs @@ -4,6 +4,6 @@ import QbsFunctions Product { Depends { name: "Qt.core" } property string minimumQtVersion: "5.1.0" - cpp.defines: ["QT_NO_CAST_FROM_ASCII"] + cpp.defines: ["QT_NO_CAST_FROM_ASCII", "QT_NO_PROCESS_COMBINED_ARGUMENT_START"] condition: QbsFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) } diff --git a/src/lib/library.pri b/src/lib/library.pri index e6b79f63e..752a29954 100644 --- a/src/lib/library.pri +++ b/src/lib/library.pri @@ -12,7 +12,7 @@ CONFIG(static, static|shared) { } else { DEFINES += QBS_LIBRARY } -DEFINES += QT_NO_CAST_FROM_ASCII +DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START INCLUDEPATH += $${PWD}/../ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d |