summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-12-07 10:28:47 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-07 19:27:08 +0000
commit8d027bbbf6573337c9c842a26fe8b823e4922bb0 (patch)
tree3ec5d6ed685de0817c8fa6936fad4fe091647eab
parentacfe198d08a45854e8edf1b1fadacec58ce6e075 (diff)
Doc: Add -qt-host-path to configure's help screen
Change-Id: Ia32377e08d72f82e71ce6f2c08e61bd8991b3077 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit a201ce7f11291cbb6810f295126fb3533edbdc53) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--cmake/configure-cmake-mapping.md2
-rw-r--r--config_help.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md
index 6b6ec25466..f6615b02a6 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 <dir> | -DINSTALL_BINDIR=<dir> | similar for -headerdir -libdir and so on |
| -hostdatadir <dir> | -DINSTALL_MKSPECSDIR=<dir> | |
| -host*dir <dir> | n/a | |
diff --git a/config_help.txt b/config_help.txt
index 6ca76433f9..c912fa00b0 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 <path> . Specify path to a Qt host build for cross-compiling.
-qtnamespace <name> .. Wrap all Qt library code in 'namespace <name> {...}'.
-qtlibinfix <infix> .. Rename all libQt6*.so to libQt6*<infix>.so.