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

configure: reload spec after configuring paths

Browse Source 
this fixes the x-build for raspberry pi, as that spec refers to the
sysroot.

the path setup doesn't require the device options to be in effect yet,
so it was sufficient to move the existing spec reload to a later point
in time.

Change-Id: Idc521aa13ff441931e954c7c9004472cf7061ee1
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-12-20 16:32:59 +01:00
parent a71b53d600
commit 4cbec6b730
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.json
View File

@ -423,7 +423,7 @@
"features": { "features": {
"prepare": { "prepare": {
"output": [ "prepareSpec", "prepareOptions", "preparePaths" ] "output": [ "prepareSpec", "prepareOptions", "preparePaths", "reloadSpec" ]
}, },
"machineTuple": { "machineTuple": {
"condition": "!config.linux || config.android || tests.machineTuple", "condition": "!config.linux || config.android || tests.machineTuple",

14
configure.pri
View File

@ -593,9 +593,8 @@ defineTest(qtConfOutput_prepareOptions) {
export($${currentConfig}.output.devicePro) export($${currentConfig}.output.devicePro)
# reload the spec to make the settings actually take effect. # if any settings were made, the spec will be reloaded later
!isEmpty($${currentConfig}.output.devicePro): \ # to make them take effect.
reloadSpec()
} }
defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_machineTuple) {
@ -842,6 +841,15 @@ defineTest(qtConfOutput_preparePaths) {
"Prefix=$$QT_SOURCE_TREE" "Prefix=$$QT_SOURCE_TREE"
write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error() write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error()
reload_properties() reload_properties()
# if a sysroot was configured, the spec will be reloaded later,
# as some specs contain $$[SYSROOT] references.
}
defineTest(qtConfOutput_reloadSpec) {
!isEmpty($${currentConfig}.output.devicePro)| \
!isEmpty(config.input.sysroot): \
reloadSpec()
} }
defineTest(qtConfOutput_shared) { defineTest(qtConfOutput_shared) {