Commit 4594e8b4 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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: default avatarAndras Becsi <andras.becsi@theqtcompany.com>
Showing with 2 additions and 3 deletions
...@@ -11,6 +11,8 @@ MODULE_BASE_DIR = $$QTWEBENGINE_ROOT ...@@ -11,6 +11,8 @@ MODULE_BASE_DIR = $$QTWEBENGINE_ROOT
EOL = $$escape_expand(\\n) EOL = $$escape_expand(\\n)
# Call the original default_pre.
load(default_pre)
load(functions) load(functions)
# Check platform support and run config tests early enough to bail # Check platform support and run config tests early enough to bail
...@@ -18,6 +20,3 @@ equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): isPlatformSupported() ...@@ -18,6 +20,3 @@ equals(_PRO_FILE_, "$$QTWEBENGINE_ROOT/qtwebengine.pro"): isPlatformSupported()
load(configure) load(configure)
runConfigure() runConfigure()
} }
# Call the original default_pre.
load(default_pre)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment