diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
| commit | 0e96b5fe482802935ae202e2297404845e440d71 (patch) | |
| tree | 79c566f18bc605261f69d750d2935b91edba3861 /config_help.txt | |
| parent | da43362921a62ea3163a042be20ec0f550d05cfa (diff) | |
| parent | 5733dfbd90fd059e7310786faefb022b00289592 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
src/widgets/kernel/qtooltip.cpp
Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt index 5369163055..fb37cbaed9 100644 --- a/config_help.txt +++ b/config_help.txt @@ -17,7 +17,8 @@ quoting and double quotes for the outer quoting. Top-level installation directories: -prefix <dir> ...... The deployment directory, as seen on the target device. - [/usr/local/Qt-$QT_VERSION, $PWD if -developer-build] + [/usr/local/Qt-$QT_VERSION; qtbase build directory if + -developer-build] -extprefix <dir> ... The installation directory, as seen on the host machine. [SYSROOT/PREFIX] -hostprefix [dir] .. The installation directory for build tools running on @@ -292,7 +293,7 @@ Gui, printing, widget options: -kms ............... Enable backends for KMS [auto] (Linux only) -linuxfb ........... Enable Linux Framebuffer support [auto] (Linux only) -mirclient ......... Enable Mir client support [no] (Linux only) - -xcb ............... Select used xcb-* libraries [system/qt/no] + -xcb ............... Enable X11 support. Select used xcb-* libraries [system/qt/no] (-qt-xcb still uses system version of libxcb itself) Input backends: |