Merge branch 'master' into lighthouse-master
authorJørgen Lind <jorgen.lind@nokia.com>
Wed, 26 Jan 2011 13:17:08 +0000 (14:17 +0100)
committerJørgen Lind <jorgen.lind@nokia.com>
Wed, 26 Jan 2011 13:17:08 +0000 (14:17 +0100)
commitb0390e68893dd04076434695be5e676b87bc067c
tree60543fd8cf8c72f530a8865fa8fc2306bb52b9ba
parent537312d5dea24bd404666789119a5ad1bab04396
parent57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9
Merge branch 'master' into lighthouse-master
13 files changed:
configure
mkspecs/features/qttest_p4.prf
src/gui/embedded/qkbd_defaultmap_qws_p.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qdnd_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/opengl/qglpaintdevice.cpp
src/opengl/qglpaintdevice_p.h
src/opengl/qwindowsurface_gl.cpp