Merge "Merge master into api_changes" into refs/staging/api_changes

diff --cc src/corelib/global/qfeatures.h
Simple merge

diff --cc src/corelib/global/qfeatures.txt
Simple merge

diff --cc src/corelib/kernel/qcoreevent.h
Simple merge

diff --cc src/widgets/dialogs/qmessagebox.cpp
Simple merge

diff --cc src/widgets/styles/qwindowsxpstyle.cpp
Simple merge

diff --cc tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Simple merge