Merge branch 'master-upstream' into master-water
authorThierry Bastian <thierry.bastian@nokia.com>
Thu, 20 Jan 2011 10:38:03 +0000 (11:38 +0100)
committerThierry Bastian <thierry.bastian@nokia.com>
Thu, 20 Jan 2011 10:38:03 +0000 (11:38 +0100)
commitef998bca70a799806c5754edfa49ea625881bc3e
tree2f1ec89d331283cfe53c0cdf5e287683960953e0
parent43f8762367fa6ffc228ae6e97192766475b02ac0
parent78a927cd7b93ae3fadd272cab9ee594a1369cea4
Merge branch 'master-upstream' into master-water
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/gui/dialogs/qfiledialog.cpp
src/gui/graphicsview/qgridlayoutengine.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/painting/qdrawingprimitive_sse2_p.h
src/gui/widgets/qeffects.cpp
src/gui/widgets/qtoolbarlayout.cpp
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qheaderview/tst_qheaderview.cpp
tests/auto/qwidget/tst_qwidget.cpp