diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-27 14:08:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-27 14:08:22 (GMT) |
| commit | ca43022cb80be68a1f32afc2d2ab75f6bf103abb (patch) | |
| tree | 795bf721af62a94373aa265172e09c1389671356 /tools | |
| parent | 7a2f867546ed8c40b77b533c0cd21d4f3d2e9cd5 (diff) | |
| parent | c64635b53a014da36203c576954042916cf87a7c (diff) | |
| download | Qt-ca43022cb80be68a1f32afc2d2ab75f6bf103abb.zip Qt-ca43022cb80be68a1f32afc2d2ab75f6bf103abb.tar.gz Qt-ca43022cb80be68a1f32afc2d2ab75f6bf103abb.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Avoid call markParentDirty twice in prepareGeometryChange
Added a warning to QGLWidget::renderText().
Compiler warning.
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions