diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 11:37:04 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 11:37:04 (GMT) |
commit | a6633a9cf1bb2083d0ce41f4667b3f9349a39865 (patch) | |
tree | f26b48a5c03e22fe96cdbf50f93fefb4c202e594 /src/opengl/qgl.cpp | |
parent | d4da5248006e4a9f4d6a454bf754407a34a09407 (diff) | |
parent | 794c7c77f28bb530db017cc25a5e33e00933253b (diff) | |
download | Qt-a6633a9cf1bb2083d0ce41f4667b3f9349a39865.zip Qt-a6633a9cf1bb2083d0ce41f4667b3f9349a39865.tar.gz Qt-a6633a9cf1bb2083d0ce41f4667b3f9349a39865.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the issue of resizing a window with the
Add QTextFragment::glyphs() accessor
Diffstat (limited to 'src/opengl/qgl.cpp')
0 files changed, 0 insertions, 0 deletions