From 4b9173e3540bd5a80b98be2f41832ae877c2cd1d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 3 Mar 2021 20:20:51 +0100 Subject: [PATCH] Fix QT_HOST_LIBEXECS for cross-builds on Windows Like for LibraryExecutables, we must default to "bin" on Windows for HostLibraryExecutables in our generated qconfig.cpp. Pick-to: 6.1 Fixes: QTBUG-91496 Change-Id: Ib5a4b3b3fd6192bd953e615058b482e67ad19462 Reviewed-by: Cristian Adam --- src/corelib/global/qconfig.cpp.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in index 57a5b4116e..b529e19830 100644 --- a/src/corelib/global/qconfig.cpp.in +++ b/src/corelib/global/qconfig.cpp.in @@ -86,7 +86,11 @@ static const struct { { "Sysroot", "" }, { "SysrootifyPrefix", "" }, { "HostBinaries", "bin" }, +#ifdef Q_OS_WIN + { "HostLibraryExecutables", "bin" }, +#else { "HostLibraryExecutables", "libexec" }, +#endif { "HostLibraries", "lib" }, { "HostData", "." }, { "TargetSpec", "" },