diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-03 20:20:51 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-03-07 08:56:03 +0100 |
| commit | 542f2036e7e3aadd2bb144125250c22a7a6509b4 (patch) | |
| tree | 1677872796184a42bfa890bc3cb25de7440e2651 | |
| parent | 5618d5127276b33d9768fed1da7ce50cafd70b9d (diff) | |
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.
Fixes: QTBUG-91496
Change-Id: Ib5a4b3b3fd6192bd953e615058b482e67ad19462
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 4b9173e3540bd5a80b98be2f41832ae877c2cd1d)
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 3c7e16738e..840ec665a4 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -395,7 +395,11 @@ static const struct { { "Sysroot", "" }, { "SysrootifyPrefix", "" }, { "HostBinaries", "bin" }, +#ifdef Q_OS_WIN + { "HostLibraryExecutables", "bin" }, +#else { "HostLibraryExecutables", "libexec" }, +#endif { "HostLibraries", "lib" }, { "HostData", "." }, { "TargetSpec", "" }, |