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 /qmake | |
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 'qmake')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 3 | ||||
-rw-r--r-- | qmake/property.cpp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index d646847217..68d09edbf4 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -4315,6 +4315,9 @@ and stored in the \l{QMAKESPEC} variable during a target build \li QT_HOST_BINS - location of host executables \li QT_HOST_DATA - location of data for host executables used by qmake + \li QT_HOST_LIBS - location of host libraries + \li QT_HOST_LIBEXECS - location of executables required by host + libraries at runtime \li QT_HOST_PREFIX - default prefix for all host paths \li QT_INSTALL_ARCHDATA - location of general architecture-dependent Qt data diff --git a/qmake/property.cpp b/qmake/property.cpp index eb5e582da5..63048f906d 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -63,6 +63,7 @@ static const struct { { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true, false }, { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true, false }, { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true, false }, + { "QT_HOST_LIBEXECS", QLibraryInfo::HostLibraryExecutablesPath, true, false }, { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true, true }, { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true, true }, }; |