summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-09-08 07:01:43 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2011-09-08 07:14:39 (GMT)
commit6f59466721d1d11d11da2c46f9e4092f65b14acf (patch)
treed20e538340801d55dfd12afee2986aea616b827b
parent82286c2b96d9408b825c9c1d94ad45af371f09ea (diff)
downloadQt-6f59466721d1d11d11da2c46f9e4092f65b14acf.zip
Qt-6f59466721d1d11d11da2c46f9e4092f65b14acf.tar.gz
Qt-6f59466721d1d11d11da2c46f9e4092f65b14acf.tar.bz2
Fix regression in tst_qrawfont
Change 4d8cd11179e6cca162efe650d308124dc7aefb14 broke QRawFont on Windows by removing some code. After the font has been renamed, we need to use the new font tables rather than the old ones for registering the font in the system. Reviewed-by: aavit
-rw-r--r--src/gui/text/qrawfont_win.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qrawfont_win.cpp b/src/gui/text/qrawfont_win.cpp
index ea1e75b..a729e31 100644
--- a/src/gui/text/qrawfont_win.cpp
+++ b/src/gui/text/qrawfont_win.cpp
@@ -578,7 +578,9 @@ void QRawFontPrivate::platformLoadFromData(const QByteArray &fontData,
resolveGdi32();
if (ptrAddFontMemResourceEx && ptrRemoveFontMemResourceEx) {
DWORD count = 0;
- fontHandle = ptrAddFontMemResourceEx((void *)fontData.constData(), fontData.size(), 0, &count);
+ QByteArray newFontData = font.data();
+ fontHandle = ptrAddFontMemResourceEx((void *)newFontData.constData(), newFontData.size(),
+ 0, &count);
if (count == 0 && fontHandle != NULL) {
ptrRemoveFontMemResourceEx(fontHandle);
fontHandle = NULL;