summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-18 17:06:22 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-18 19:13:11 +0200
commite2b2cd9397c76e91ac1ebe493bcac7696767c02e (patch)
tree6da7e759aff34517bbf4096d720159e5b14c7253 /util
parent28ef8d283db336d0d1641b8fbab31eac5b46a498 (diff)
CMake: Improve automatic compiler embedding into the Qt toolchain
Embedding the initial CMAKE_CXX_COMPILER into qt.toolchain.cmake breaks Boot2Qt builds, because the CXX environment variable is not used anymore when building qtsvg or other projects. Disable automatic embedding when cross-compiling, while keeping it enabled for non-cross-compiling cases (to keep Windows and and ICC configurations working). Allow opting in or out of the embedding in case if the default is wrong, via QT_EMBED_TOOLCHAIN_COMPILER. Task-number: QTBUG-85067 Change-Id: I1d8f9f580bc379b77c34eefb5728bb49f93cc81a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions