diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-04 09:29:22 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-04 10:11:30 +0000 |
| commit | ffa14187a1a6876cabe14a19513462117de68594 (patch) | |
| tree | 8cbd5f7154cb68dfff18125b2b5992122516e012 | |
| parent | 18f1a8d759073e4d8cddfaa99a77c72f21efa5c3 (diff) | |
qbs build: Fix regression with qbs 1.13
Don't fall back to pkg-config for non-existing dev headers products, as
that becomes expensive.
Change-Id: Ibf51a93950e04ee061ca16444fbc18349389d74a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -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 |