Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.7' into dev | Liang Qi | 2016-05-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | 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 | ||||
* | Move the help text for configure into its own file | Lars Knoll | 2016-05-01 | 1 | -0/+433 |
Change-Id: If9c86c5bf9c6194f1ac282a657f9967f4fa589b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> |