diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-02-04 15:21:55 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-02-04 15:21:55 +0100 |
| commit | 88b29792cbb7899c4179bc95e6468b7afbd81c6f (patch) | |
| tree | 2ce53e1c7f581ef8385a5d83513b0ef80f346eb7 /qbs | |
| parent | 7dba3f083cad8d2a864c2a41e16cab5ec446dc26 (diff) | |
| parent | ffa14187a1a6876cabe14a19513462117de68594 (diff) | |
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
src/plugins/android/androidrunnerworker.cpp
src/plugins/android/androidrunnerworker.h
Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 0dc1e9b3b1..1caf073e98 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -19,7 +19,14 @@ Product { Depends { name: "cpp" } Depends { name: "qtc" } - Depends { name: product.name + " dev headers"; required: false } + Depends { + name: product.name + " dev headers"; + required: false + Properties { + condition: Utilities.versionCompare(qbs.version, "1.13") >= 0 + enableFallback: false + } + } Depends { name: "Qt.core"; versionAtLeast: "5.9.0" } // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that |