From 4594e8b48ffa8cf4245c4040e3d6d28aaf9cd5cf Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Date: Wed, 18 Feb 2015 16:48:49 +0100
Subject: [PATCH] Call default_pre before using its results
To check the XCode version, default_pre has to be run first.
Under most circumstances the order is not important since the value
gets cached, that's why current builds usually work.
Change-Id: I2613e92189592d7b25200e22a378f9f593b5057e
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
tools/qmake/mkspecs/features/default_pre.prf | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/tools/qmake/mkspecs/features/default_pre.prf
index 02f4f24d4..2e556c2a6 100644
--- a/tools/qmake/mkspecs/features/default_pre.prf
+++ b/tools/qmake/mkspecs/features/default_pre.prf
@@ -11,6 +11,8 @@ MODULE_BASE_DIR = $$QTWEBENGINE_ROOT
EOL = $$escape_expand(\\n)
+# Call the original default_pre.
+load(default_pre)
load(functions)
# Check platform support and run config tests early enough to bail
@@ -18,6 +20,3 @@ equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): isPlatformSupported()
load(configure)
runConfigure()
}
-
-# Call the original default_pre.
-load(default_pre)
--
GitLab