From 4fbb040f754b7db310018394dd7ea6f5c997d50e Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 30 Jun 2020 21:04:54 +0200 Subject: [PATCH] CMake: Hard-code QT_CONFIGURE_CROSSBUILD to 0 The qmake we're building is always built for the target platform. Therefore, QT_CONFIGURE_CROSSBUILD can always be set to a falsy value. Change-Id: I0f03c4ce0c75d3b4e97be5141adf742276131dcb Reviewed-by: Alexandru Croitor --- src/corelib/global/qconfig.cpp.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in index 6f61f4333cf..5c6ecf24855 100644 --- a/src/corelib/global/qconfig.cpp.in +++ b/src/corelib/global/qconfig.cpp.in @@ -23,6 +23,7 @@ static const char qt_configure_strs[] = #define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@" #define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@" #ifdef QT_BUILD_QMAKE +# define QT_CONFIGURE_CROSSBUILD 0 # define QT_CONFIGURE_SYSROOTIFY_PREFIX false #endif #define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12