diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 09:27:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 09:27:44 (GMT) |
| commit | 5878027280de47e8b8fc72a4d0d48f5e5f6dc7db (patch) | |
| tree | 6fb1dc947afcc52447c6b2139be0924ff9ce1ac5 /src/opengl/qgl_x11egl.cpp | |
| parent | bd7da0db4386608eecdb32792d63ec840c8fe0bf (diff) | |
| parent | 213eb572f1902550e36f7e677733aba8d066d94b (diff) | |
| download | Qt-5878027280de47e8b8fc72a4d0d48f5e5f6dc7db.zip Qt-5878027280de47e8b8fc72a4d0d48f5e5f6dc7db.tar.gz Qt-5878027280de47e8b8fc72a4d0d48f5e5f6dc7db.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