AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prospective fix for Boot2Qt build in the CI

Browse Source 
One of the parameters that Coin passes to configure is this:

    -device-option DISTRO_OPTS="hard-float boot2qt"

The configure script would "swallow" the quotes and end up calling qmake
with -device-option DISTRO_OPTS=hard-float boot2qt, causing qmake to
complain that the standalone "boot2qt" option is unknown.

Fix this by preserving the quotes in the forwarding helper functions.

Change-Id: I16098bd35acb579ebf183b0f7746af8758269e7c
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
This commit is contained in:
Simon Hausmann 2019-10-17 16:48:01 +02:00
parent 077ea818af
commit 68296aaed4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -974,7 +974,7 @@ IFS=$SAVED_IFS
cmake $* "$relpath" cmake $* "$relpath"
} }
parseCommandline $@ parseCommandline "$@"
handleHelp handleHelp
if [ "$BUILD_WITH_CMAKE" = "yes" ]; then if [ "$BUILD_WITH_CMAKE" = "yes" ]; then
getCMakeCmdLine $@ getCMakeCmdLine $@
@ -984,8 +984,8 @@ else
findAwk findAwk
findMake findMake
checkQMakeEnv checkQMakeEnv
checkTopLevelBuild $@ checkTopLevelBuild "$@"
getOptAndQMakeCmdLines $@ getOptAndQMakeCmdLines "$@"
detectOperatingSystem detectOperatingSystem
maybeVerifyXcode maybeVerifyXcode
detectQtVersion detectQtVersion