From 5cfd5fd9d7ece7e1eb3c4d2be8ec342b376acf38 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 20 Feb 2018 12:33:23 +0100 Subject: 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 Change-Id: I940917d6763842499b18fffd1514c96889a0cc63 Reviewed-by: Thiago Macieira --- mkspecs/features/qt_configure.prf | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mkspecs') 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\..*") { -- cgit v1.2.3