diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 10:36:21 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 10:36:21 (GMT) |
commit | 99d33dbaade6417ef1697bdfb82fdd1ec8e659c0 (patch) | |
tree | f131238944a060af418b83596958158e6110a6aa /src/opengl/qgl_p.h | |
parent | 9e85af3454bd0a2d962523d52e688f9bc7259528 (diff) | |
parent | af617c319772a34115d0c4d802f25a807cb43065 (diff) | |
download | Qt-99d33dbaade6417ef1697bdfb82fdd1ec8e659c0.zip Qt-99d33dbaade6417ef1697bdfb82fdd1ec8e659c0.tar.gz Qt-99d33dbaade6417ef1697bdfb82fdd1ec8e659c0.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Designer: Avoid nested QDialog's in item widget content dialogs.
Diffstat (limited to 'src/opengl/qgl_p.h')
0 files changed, 0 insertions, 0 deletions