Merge remote branch 'origin/master' into refactor
authorLars Knoll <lars.knoll@nokia.com>
Thu, 12 May 2011 09:02:01 +0000 (11:02 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Thu, 12 May 2011 10:48:12 +0000 (12:48 +0200)
commit6697f2a899fac47a65122a85691b2cfe63c6152c
tree6ae8ad93c7455f9571d1b1b868ae077af89d96df
parente577d02cc9cba2033cd21c23a4420a1f0d5469a4
parent1f806aa1b40db276dad359863d018171080d93f9
Merge remote branch 'origin/master' into refactor

Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
26 files changed:
configure
src/corelib/global/qnamespace.h
src/gui/gui.pro
src/gui/image/qimage.cpp
src/gui/image/qpixmap.cpp
src/gui/painting/painting.pri
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qtextdocument.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/opengl/opengl.pro
src/widgets/itemviews/itemviews.pri
src/widgets/itemviews/qidentityproxymodel.cpp
src/widgets/itemviews/qidentityproxymodel.h
src/widgets/itemviews/qsortfilterproxymodel.cpp
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/platforms/s60/qwidget_s60.cpp
src/widgets/to_be_moved/qlinecontrol.cpp
src/widgets/to_be_moved/qlinecontrol_p.h
src/widgets/widgets.pro
src/widgets/widgets/qlineedit.cpp
src/widgets/widgets/qlineedit.h
sync.profile
tests/auto/qvariant/tst_qvariant.cpp