diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-09 11:19:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-09 11:19:48 (GMT) |
| commit | f8e2daddc56afa9e601c14a3e25be5316c2a6d69 (patch) | |
| tree | 853f9416fc7a584b3248ae6bd7b836f019be652a /src/gui/text/qfontengine_p.h | |
| parent | bfe1b734cf138a05611666a6a4f351c52d825290 (diff) | |
| parent | 2b358140c6b75ee29135175535190d415f5af10f (diff) | |
| download | Qt-f8e2daddc56afa9e601c14a3e25be5316c2a6d69.zip Qt-f8e2daddc56afa9e601c14a3e25be5316c2a6d69.tar.gz Qt-f8e2daddc56afa9e601c14a3e25be5316c2a6d69.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: (37 commits)
Small fix in iteviews for sizeHintForColumn/Row
Incorrect assertion in item views
Track the GL DCs we use across different threads under Windows.
Add copyright header
Avoid static local QHash
Remove explicit 'virtual' specifiers to conform to Qt coding standard
Use Q_ASSERT_X() rather than Q_ASSERT(!"message") idiom
Add eglnullws QScreen driver
Fixes the double spinbox not updating geometry when suffix is changed
Made QGL2GradientCache thread safe.
Add QItemSelectionRange::operator<()
Don't call GetDC() nedlessly.
Make QScriptAnalysis fit in two bytes again
QGLPixelBuffer should not rely on temporary QGLWidgets.
Initialize pex.
Remove warning.
Fix the tests for the internal GL resource system.
Rework how QGLTextureGlyphCache makes use of the resource system.
The group pointer should no longer be a part of the 64 bit int.
Enable glyph uploads from a thread in the X11 font engine.
...
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
0 files changed, 0 insertions, 0 deletions