Fix top-level builds with qmake
The separation of functionality into functions in commit
37756ede09
accidentally broke top-level
builds as the function to detect -top-level was operating on local
parameters (shift) or they were not available ($1). Inlining these few
lines fixes it.
Change-Id: Icf609dc5e7b361997847f3ef3a1b10635c122d5d
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
parent
204765ba49
commit
3ecfeb3629
30
configure
vendored
30
configure
vendored
@ -96,21 +96,6 @@ fi
|
||||
# do this early so we don't store it in config.status
|
||||
CFG_TOPLEVEL=
|
||||
outpathPrefix=
|
||||
checkTopLevelBuild()
|
||||
{
|
||||
relpathMangled=$relpath
|
||||
if [ x"$1" = x"-top-level" ]; then
|
||||
CFG_TOPLEVEL=yes
|
||||
relpathMangled=`dirname "$relpath"`
|
||||
outpathPrefix=../
|
||||
shift
|
||||
else
|
||||
if [ -f ../.qmake.super ]; then
|
||||
echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
CMAKE_CMDLINE=
|
||||
getCMakeCmdLine()
|
||||
@ -982,7 +967,20 @@ else
|
||||
findAwk
|
||||
findMake
|
||||
checkQMakeEnv
|
||||
checkTopLevelBuild
|
||||
|
||||
relpathMangled=$relpath
|
||||
if [ x"$1" = x"-top-level" ]; then
|
||||
CFG_TOPLEVEL=yes
|
||||
relpathMangled=`dirname "$relpath"`
|
||||
outpathPrefix=../
|
||||
shift
|
||||
else
|
||||
if [ -f ../.qmake.super ]; then
|
||||
echo >&2 "ERROR: You cannot configure qtbase separately within a top-level build."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
getOptAndQMakeCmdLines $@
|
||||
detectOperatingSystem
|
||||
maybeVerifyXcode
|
||||
|
Loading…
Reference in New Issue
Block a user