summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2020-02-10 10:14:54 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2020-02-13 09:41:10 +0000
commit0091a50bbd1486b2ee1713ac2a63e4117f6ccd78 (patch)
tree9a8877c9d827238ad4dcf51014cf796523dd2709
parent97bb1ddc0815997b27e831073085df277bd9e32e (diff)
Doc: Fix botched attempt of documenting the 'relocatable' feature
We don't have a -relocatable configure switch. Move the documentation to the right place (configure -list-features). The correct configure switches to turn the feature on/off are -feature-relocatable and -no-feature-relocatable. Task-number: QTBUG-80928 Change-Id: I96df0f44f12b2efe5a64132e9006d4b73de41255 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Tasuku Suzuki <tasuku.suzuki@kdab.com> Reviewed-by: Yuhang Zhao <2546789017@qq.com>
-rw-r--r--config_help.txt2
-rw-r--r--configure.json1
2 files changed, 1 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt
index 0231234cf9..15627a179b 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -163,8 +163,6 @@ Build options:
-reduce-exports ...... Reduce amount of exported symbols [auto]
-reduce-relocations .. Reduce amount of relocations [auto] (Unix only)
- -relocatable ......... Enable the Qt installation to be relocated [auto]
-
-plugin-manifests .... Embed manifests into plugins [no] (Windows only)
-static-runtime ...... With -static, use static runtime [no] (Windows only)
diff --git a/configure.json b/configure.json
index 62d78f8dc6..868f15db13 100644
--- a/configure.json
+++ b/configure.json
@@ -1380,6 +1380,7 @@
},
"relocatable": {
"label": "Relocatable",
+ "purpose": "Enable the Qt installation to be relocated.",
"autoDetect": "features.shared",
"condition": "features.dlopen || config.win32 || !features.shared",
"output": [ "privateFeature" ]