From a201ce7f11291cbb6810f295126fb3533edbdc53 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 7 Dec 2020 10:28:47 +0100 Subject: [PATCH] Doc: Add -qt-host-path to configure's help screen Pick-to: 6.0 Change-Id: Ia32377e08d72f82e71ce6f2c08e61bd8991b3077 Reviewed-by: Alexandru Croitor --- cmake/configure-cmake-mapping.md | 2 +- config_help.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 6b6ec25466d..f6615b02a63 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -7,7 +7,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349. | -prefix /opt/qt6 | -DCMAKE_INSTALL_PREFIX=/opt/qta6 | | | -extprefix /opt/qt6 | -DCMAKE_STAGING_PREFIX=/opt/qt6 | | | -hostprefix /where/ever | n/a | When cross-building Qt, we do not build for host system anymore | -| -external-hostbindir /path/to/host/qt | -DQT_HOST_PATH=/path/to/host/qt | | +| -external-hostbindir /path/to/host/qt | -DQT_HOST_PATH=/path/to/host/qt | Can be set with configure -qt-host-path /path/to/host/qt. | | -bindir | -DINSTALL_BINDIR= | similar for -headerdir -libdir and so on | | -hostdatadir | -DINSTALL_MKSPECSDIR= | | | -host*dir | n/a | | diff --git a/config_help.txt b/config_help.txt index 6ca76433f96..c912fa00b08 100644 --- a/config_help.txt +++ b/config_help.txt @@ -89,6 +89,7 @@ Build options: through an app store by default, in particular Android, iOS, tvOS, and watchOS. [auto] + -qt-host-path . Specify path to a Qt host build for cross-compiling. -qtnamespace .. Wrap all Qt library code in 'namespace {...}'. -qtlibinfix .. Rename all libQt6*.so to libQt6*.so.