1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat -xplatform or -device-option as being a cross compilation

Browse Source 
Task-number: QTBUG-85279
Change-Id: I623108be2cba1dad28c5b692c2b5836a68144854
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 26eb4e63e0195d49ebfa765e9ae1522a1971464d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2020-07-08 13:28:09 +02:00 committed by Qt Cherry-pick Bot
parent 3fe33f5143
commit a0adcb7bd9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.pri
View File

@ -61,6 +61,8 @@ defineTest(qtConfCommandline_sanitize) {
# callbacks # callbacks
defineReplace(qtConfFunc_crossCompile) { defineReplace(qtConfFunc_crossCompile) {
!isEmpty(config.input.xplatform): return(true)
!isEmpty(config.input.device-option): return(true)
!isEmpty(config.input.sysroot): return(true) !isEmpty(config.input.sysroot): return(true)
spec = $$[QMAKE_SPEC] spec = $$[QMAKE_SPEC]
!equals(spec, $$[QMAKE_XSPEC]): return(true) !equals(spec, $$[QMAKE_XSPEC]): return(true)