diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-01-28 11:23:20 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-02-18 11:46:42 +0100 |
| commit | edd122548940a0213e35d11649566efbef7f1fea (patch) | |
| tree | b2372fcd68c748ad964b1000057124792789114b /src | |
| parent | 0ad434c2e9c81ae319840b1bc563c9f04efac524 (diff) | |
qmake: Introduce QT_HOST_LIBEXECS property
This will be used to access host tools that are installed in
${prefix}/libexec instead of ${prefix}/bin.
Pick-to: 6.1
Change-Id: I36c4b5736330f8229d267a117c65d55cd5e12758
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 9 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index cec6431206..d3f0f95ad8 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -365,8 +365,14 @@ QVersionNumber QLibraryInfo::version() noexcept * - add to qt_config.prf, qt_module.prf, qt_module_fwdpri.prf */ +#ifdef QT_BUILD_QMAKE +constexpr size_t qtConfEntriesKeySize = 23; +#else +constexpr size_t qtConfEntriesKeySize = 19; +#endif + static const struct { - char key[19], value[13]; + char key[qtConfEntriesKeySize], value[13]; } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc @@ -389,6 +395,7 @@ static const struct { { "Sysroot", "" }, { "SysrootifyPrefix", "" }, { "HostBinaries", "bin" }, + { "HostLibraryExecutables", "libexec" }, { "HostLibraries", "lib" }, { "HostData", "." }, { "TargetSpec", "" }, diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index bfb3a9f858..618dfaab70 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -79,6 +79,7 @@ public: SysrootPath, SysrootifyPrefixPath, HostBinariesPath, + HostLibraryExecutablesPath, HostLibrariesPath, HostDataPath, TargetSpecPath, |