Merge remote branch 'origin/master' into refactor
authorLars Knoll <lars.knoll@nokia.com>
Mon, 16 May 2011 08:19:02 +0000 (10:19 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Mon, 16 May 2011 08:19:02 +0000 (10:19 +0200)
commit276d60a4d6c9d1b72c4aa7df1f86e7ce9097beeb
tree73130ce8a80181fb9d234028c5057d7eb86f02ab
parent850b602c7a72635eb37a998089ee085d5d505c34
parent173099696f44073441975febfa35ddfb3585e8c5
Merge remote branch 'origin/master' into refactor

Conflicts:
src/modules/qt_openvg.pri
src/widgets/to_be_moved/qlinecontrol_p.h
15 files changed:
src/modules/qt_opengl.pri
src/plugins/platforms/wayland/qwaylandclipboard.cpp
src/plugins/platforms/xcb/xcb.pro
src/widgets/accessible/qaccessible.h
src/widgets/graphicsview/qgraphicslayout.cpp
src/widgets/graphicsview/qgraphicslayout.h
src/widgets/graphicsview/qgraphicslayout_p.cpp
src/widgets/graphicsview/qgraphicslinearlayout.cpp
src/widgets/graphicsview/qgraphicswidget.cpp
src/widgets/itemviews/qidentityproxymodel.cpp
src/widgets/itemviews/qidentityproxymodel.h
src/widgets/to_be_moved/qlinecontrol.cpp
src/widgets/to_be_moved/qlinecontrol_p.h
src/widgets/widgets/qlineedit_p.cpp
src/widgets/widgets/qlineedit_p.h