diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-14 21:10:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-14 21:10:38 (GMT) |
commit | 192ed507cdb16125d2cdcaff63b1591c0d6b4596 (patch) | |
tree | abf49efb852a916749f44a3c3ed888019c460a38 /src/gui/math3d | |
parent | 10fb4f1fe7750bb48be015169c827cb585e19196 (diff) | |
parent | 11f20a34cbad9797545ab4eb638ff311af6fc6fc (diff) | |
download | Qt-192ed507cdb16125d2cdcaff63b1591c0d6b4596.zip Qt-192ed507cdb16125d2cdcaff63b1591c0d6b4596.tar.gz Qt-192ed507cdb16125d2cdcaff63b1591c0d6b4596.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
When asking for relations, don't crash on children that don't return an interface.
Remove more inconsistencies with invisible.
Fix a problem where the video would'nt show on some containers
QAccessibleToolButton::text should return accessibleName if set.
Remove stray semicolon.
Diffstat (limited to 'src/gui/math3d')
0 files changed, 0 insertions, 0 deletions