diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 18:35:57 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 18:35:57 +0200 |
| commit | 50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (patch) | |
| tree | 7517568b333bcc5679e7a165c48aaa7bd06a66fb /src/gui/text/qfontengine_win.cpp | |
| parent | 61f013168e5ef5111948a1ae0a1464753986adb2 (diff) | |
| parent | ce40a078caa4a09793128ca730cc5ca268aeee87 (diff) | |
| download | qt4-tools-50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5.tar.gz | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index a941dabb2a..cf4fbdad43 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -1209,7 +1209,7 @@ QImage QFontEngineWin::alphaMapForGlyph(glyph_t glyph, const QTransform &xform) QImage indexed(mask->width(), mask->height(), QImage::Format_Indexed8); - // ### This part is kinda pointless, but we'll crash later if we dont because some + // ### This part is kinda pointless, but we'll crash later if we don't because some // code paths expects there to be colortables for index8-bit... QVector<QRgb> colors(256); for (int i=0; i<256; ++i) |