Merge master into api_changes
authorKent Hansen <kent.hansen@nokia.com>
Fri, 23 Mar 2012 12:36:29 +0000 (13:36 +0100)
committerKent Hansen <kent.hansen@nokia.com>
Fri, 23 Mar 2012 13:10:58 +0000 (14:10 +0100)
commit3b512ae142017f105f297467f74dc28d3cb9030a
tree9e131e23c01537f051851a1da9576c1e1ddf5ba2
parente20c4730192f312881591fb50e571af0a88fe421
parentf956f9a83603a3df5651e3238c24e8df37558d6e
Merge master into api_changes

Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
20 files changed:
configure
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qobject.cpp
src/corelib/tools/qstring.cpp
src/corelib/tools/tools.pri
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/kernel/qguiapplication.cpp
src/gui/kernel/qwindow.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/opengl/qgl.cpp
src/widgets/itemviews/qlistview.cpp
src/widgets/itemviews/qtreeview.cpp
src/widgets/kernel/qapplication.h
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidgetwindow_qpa.cpp
src/widgets/styles/qwindowsstyle.cpp
src/widgets/styles/qwindowsxpstyle.cpp
src/widgets/widgets/qtabbar.cpp
tests/auto/corelib/kernel/qobject/test/test.pro