diff options
author | Tor Arne Vestbø <torarnv@gmail.com> | 2013-03-06 23:06:46 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 18:40:26 +0100 |
commit | e9837f79387c7b9cd8c1483f8f64352de07c5bda (patch) | |
tree | c8104533a265e515cc18b4d1dbcf7e66147b46f8 | |
parent | e11c2165c54ad901fe50be89bb480920f9c2cde1 (diff) |
Teach configure's pro-file parser to understand host_build scopes
Is needed now that we write QMAKE_MAC_SDK with a !host_build scope
in qdevice.pri.
Change-Id: I298cc660b496460190337c175aef684a5522d5cb
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rwxr-xr-x | configure | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -160,6 +160,12 @@ BEGIN { values["LITERAL_WHITESPACE"] = " " values["LITERAL_DOLLAR"] = "$" } +/^!?host_build:/ { + scopeStart = index($0, ":") + 1 + condition = substr($0, 0, scopeStart - 2) + if (condition != "'"$1"'") { next } + $0 = substr($0, scopeStart) +} /^[_A-Z0-9.]+[ \t]*\+?=/ { valStart = index($0, "=") + 1 @@ -225,7 +231,7 @@ getSingleQMakeVariable() getQMakeConf() { if [ -z "$specvals" ]; then - specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables` + specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"` fi getSingleQMakeVariable "$1" "$specvals" } @@ -233,7 +239,7 @@ getQMakeConf() getXQMakeConf() { if [ -z "$xspecvals" ]; then - xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables` + xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"` fi getSingleQMakeVariable "$1" "$xspecvals" } |