diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-18 09:26:53 +0100 |
| commit | b9585277e78f0571933706507ba2024c68d6df19 (patch) | |
| tree | c98577aae762b75d0ac6437c1ec68da0ddb4426b /configure.json | |
| parent | eb2af9d923923255b276c6549ada1ed7839d5dd8 (diff) | |
| parent | d7b6c4288f2de8b0123c888e83a3fbcd84ed906f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/tools/qlinkedlist.h
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/wasm/qwasmscreen.cpp
Change-Id: Iefca7f9f4966bdc20e7052aca736874861055738
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 0bf0e6d4e5..d1eb1d8102 100644 --- a/configure.json +++ b/configure.json @@ -1408,6 +1408,7 @@ }, "relocatable": { "label": "Relocatable", + "purpose": "Enable the Qt installation to be relocated.", "autoDetect": "features.shared", "condition": "features.dlopen || config.win32 || !features.shared", "output": [ "privateFeature" ] |