Merge remote-tracking branch 'qt/4.8'
authorJyri Tahtela <jyri.tahtela@nokia.com>
Mon, 16 May 2011 12:36:03 +0000 (15:36 +0300)
committerJyri Tahtela <jyri.tahtela@nokia.com>
Mon, 16 May 2011 12:36:03 +0000 (15:36 +0300)
commit82639818e567922e0255af039b9c397d13e4d9b7
tree6a6746acc321e21f546023a740b53b59297d64eb
parent1eea52e5b18ef2167d375285e3838bd7883cfd7d
parent7e4a9187bb11b794e45d95d2e9fae026d6b0d07d
Merge remote-tracking branch 'qt/4.8'
doc/src/declarative/modules.qdoc
src/declarative/qml/qdeclarativedirparser.cpp
src/declarative/qml/qdeclarativedirparser_p.h
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
tools/designer/src/designer/qdesigner_workbench.cpp