diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-09-24 12:51:17 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-09-24 13:57:52 (GMT) |
| commit | f0d257ae6ab3e1ec7c5dfb1ea646e5c824e437de (patch) | |
| tree | 33996e308999b64bcee64ddded2e609e66cace77 /tests/auto/qstatictext/tst_qstatictext.cpp | |
| parent | 1308b32a1a3e36c5b2788ad4f701a0203b876484 (diff) | |
| download | Qt-f0d257ae6ab3e1ec7c5dfb1ea646e5c824e437de.zip Qt-f0d257ae6ab3e1ec7c5dfb1ea646e5c824e437de.tar.gz Qt-f0d257ae6ab3e1ec7c5dfb1ea646e5c824e437de.tar.bz2 | |
Fix problems in QTextureGlyphCache caused by insufficient merge
Since the logic of QTextureGlyphCache has been changed, it is impossible
to do an automatic merge of eb2926a2f9607e985b8bca54346e6fdf91343247.
This change fixes problems that occurred with that change:
1. We need to postpone actually resizing the texture until
fillInPendingGlyphs() where we are sure to have a context.
2. We have to fall back to a default max texture size when there is no
context.
Reviewed-by: Trond
Diffstat (limited to 'tests/auto/qstatictext/tst_qstatictext.cpp')
0 files changed, 0 insertions, 0 deletions