Merge master into api_changes
authorKent Hansen <kent.hansen@nokia.com>
Fri, 16 Mar 2012 09:01:29 +0000 (10:01 +0100)
committerKent Hansen <kent.hansen@nokia.com>
Fri, 16 Mar 2012 09:01:29 +0000 (10:01 +0100)
commit440f452aa3a5609e5f6006a03ac36d41462d5908
tree598d682291945055e4f6feb08a228212648482c1
parentcd1e62ffc121cc68c5a133a8095d431f04d966ce
parentd4959fa6376255ab4adf8adaeb2ee47ae6b679d2
Merge master into api_changes

Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro

Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
14 files changed:
dist/changes-5.0.0
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/kernel/qmetatype.h
src/corelib/kernel/qobject.cpp
src/gui/accessible/qaccessible2.h
src/gui/accessible/qaccessibleobject.cpp
src/gui/kernel/qevent.cpp
src/printsupport/dialogs/qprintdialog.h
src/tools/bootstrap/bootstrap.pro
src/widgets/kernel/qwidget.cpp
src/widgets/widgets/qtabbar.cpp
src/widgets/widgets/qtabbar.h
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp