diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 15:30:56 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 15:30:56 +0200 |
| commit | c50827bf53e3863adcfd8c0e38aa5b7773eb075f (patch) | |
| tree | 3df66a6a76cace400d55bd2610f6aa2ce1fdc5db /qbs-resources | |
| parent | 5b3c816ca35cd4dfd14767ac06238fd3ace29b61 (diff) | |
| parent | b24c37c89f7db5363f4860ba269dba482b19a5f1 (diff) | |
Merge branch 1.4 into master.
Change-Id: I79f2638a024a807151a12d1f0b701d6533a3311f
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsProduct.qbs | 2 |
1 files changed, 1 insertions, 1 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) } |