From 1364ba04b2df4e91d8f648fb02e0c19dcac1ab30 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 9 Jan 2015 11:05:04 +0100 Subject: Refactor our build skipping logic Move the logic to mkspecs to keep the .pro files robust. Add the basic infrastructure for config.tests, the first one of which will consistently ensure we have libcap on linux. Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11 Reviewed-by: Andras Becsi --- tools/qmake/mkspecs/features/default_pre.prf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tools/qmake/mkspecs/features/default_pre.prf') diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf index aeb7c0b3b..02f4f24d4 100644 --- a/tools/qmake/mkspecs/features/default_pre.prf +++ b/tools/qmake/mkspecs/features/default_pre.prf @@ -9,8 +9,15 @@ QTWEBENGINEPROCESS_NAME = QtWebEngineProcess # Location of sync.profile MODULE_BASE_DIR = $$QTWEBENGINE_ROOT +EOL = $$escape_expand(\\n) load(functions) +# Check platform support and run config tests early enough to bail +equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): isPlatformSupported() { + load(configure) + runConfigure() +} + # Call the original default_pre. load(default_pre) -- cgit v1.2.3