Merge remote-tracking branch 'upstream/4.8' into 4.8
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Sun, 12 Jun 2011 18:28:07 +0000 (20:28 +0200)
committerFrederik Gladhorn <frederik.gladhorn@nokia.com>
Sun, 12 Jun 2011 18:30:07 +0000 (20:30 +0200)
commit999baebd708fb588d1ac13badd513cd09e4b0c45
tree179011eee7f6892b62548f870ade14ad412fa79e
parentda9b2156015a946122eacc64437d214d1e184f35
parent7e6a9419fa2167941c601751a13a4451ef8d2708
Merge remote-tracking branch 'upstream/4.8' into 4.8
src/corelib/tools/qlocale.cpp
src/gui/accessible/qaccessible_win.cpp
src/gui/accessible/qaccessiblewidget.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qwidget.cpp
src/plugins/accessible/widgets/rangecontrols.cpp
src/plugins/accessible/widgets/simplewidgets.cpp
tests/auto/qaccessibility/tst_qaccessibility.cpp
tests/auto/qfiledialog/tst_qfiledialog.cpp