diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 17:48:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-13 17:48:28 (GMT) |
| commit | 213eb572f1902550e36f7e677733aba8d066d94b (patch) | |
| tree | 923e7cbd96a30ceed95c5a0bdeacf26c38d55659 /src/opengl/qgl_x11egl.cpp | |
| parent | df28c1203e12c572f795b8d114254a8e5a6619e8 (diff) | |
| parent | b5b011a181bd187dcef5ee8f46a3ac2c5dc2e09c (diff) | |
| download | Qt-213eb572f1902550e36f7e677733aba8d066d94b.zip Qt-213eb572f1902550e36f7e677733aba8d066d94b.tar.gz Qt-213eb572f1902550e36f7e677733aba8d066d94b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes QGraphicsItem::focusItem() returning incorrect value.
Fixes crash in QGraphicsScene::addItem().
Diffstat (limited to 'src/opengl/qgl_x11egl.cpp')
0 files changed, 0 insertions, 0 deletions