Merge "Merge master into api_changes" into refs/staging/api_changes
authorKent Hansen <kent.hansen@nokia.com>
Fri, 23 Mar 2012 13:31:28 +0000 (14:31 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 23 Mar 2012 13:31:28 +0000 (14:31 +0100)
commit425b38ef95f6f4478ffbd4ada0d3046fae2c95e7
tree0347dd701ace8ab022cf6c86edbb61be9795a668
parent2f2b78321427daa8c7f0702140c297d22b0bf3c8
parent3b512ae142017f105f297467f74dc28d3cb9030a
Merge "Merge master into api_changes" into refs/staging/api_changes
src/corelib/global/qfeatures.h
src/corelib/global/qfeatures.txt
src/corelib/kernel/qcoreevent.h
src/widgets/dialogs/qmessagebox.cpp
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp