diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 15:21:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-16 16:38:33 +0100 |
| commit | b13150336174083962d90922761fd96f07e173b4 (patch) | |
| tree | 1655e9009efba21b008d7d2f810aacbde3e2c2d8 /config_help.txt | |
| parent | ff19ebcc2d9c9668af24fe8add9f70c160776367 (diff) | |
| parent | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
configure.pri
examples/widgets/painting/fontsampler/mainwindow.cpp
examples/widgets/painting/fontsampler/mainwindow.h
mkspecs/features/moc.prf
src/corelib/global/qglobal.h
src/gui/text/qtextdocument.cpp
Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config_help.txt b/config_help.txt index 28634be947..bf50491110 100644 --- a/config_help.txt +++ b/config_help.txt @@ -85,7 +85,6 @@ Build options: -framework ........... Build Qt framework bundles [yes] (Apple only) -platform <target> ... Select host mkspec [detected] - -host-option <key=value> ..... Add option for the host mkspec -xplatform <target> .. Select target mkspec when cross-compiling [PLATFORM] -device <name> ....... Cross-compile for device <name> -device-option <key=value> ... Add option for the device mkspec |