diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-20 12:33:23 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-02-22 21:39:36 +0000 |
| commit | 5cfd5fd9d7ece7e1eb3c4d2be8ec342b376acf38 (patch) | |
| tree | 4210521b95222721371bb242a685b296eaed65b2 /mkspecs | |
| parent | d98f17d4348ebf52bef7a02c3134d67bbee0a55d (diff) | |
configure: introduce 'subarch' term to expression evaluator
... and make use of it.
it's a logical continuation of the 'arch' term, and will be used also in
qt3d's configure.
Started-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I940917d6763842499b18fffd1514c96889a0cc63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index d5dcda22ac..98fff59ea1 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1270,6 +1270,12 @@ defineReplace(qtConfEvaluateSingleExpression) { isEmpty(QT_ARCH): \ qtConfCheckFeature(architecture) contains(QT_ARCH, $$var): result = true + } else: contains(e, "^subarch\..*") { + var = $$replace(e, "^subarch\.", "") + result = false + isEmpty(QT_ARCH): \ + qtConfCheckFeature(architecture) + contains(QT_CPU_FEATURES.$$QT_ARCH, $$var): result = true } else: contains(e, "^input\..*") { result = $$eval(config.$$e) } else: contains(e, "^var\..*") { |