diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
| commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
| tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /config_help.txt | |
| parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
| parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt index 971e932657..f0f1d4ca07 100644 --- a/config_help.txt +++ b/config_help.txt @@ -325,8 +325,8 @@ Additional options: -no-gbm .............. Do not compile backends for GBM. * -gbm ................. Compile backends for GBM. - -no-directfb ......... Do not compile DirectFB support. - * -directfb ............ Compile DirectFB support. + * -no-directfb ......... Do not compile DirectFB support. + -directfb ............ Compile DirectFB support. -no-linuxfb .......... Do not compile Linux Framebuffer support. * -linuxfb ............. Compile Linux Framebuffer support. |