From b84bb0b245294cfc4cdb92a093d5953bc86f0c73 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Tue, 3 Jul 2012 10:47:07 +0200
Subject: Compile when -directwrite is passed to configure

The signature for alphaRGBMapForGlyph() was updated in the
header but not the implementation. The include with
QT_BUILD_GUI_LIB defined would re-export several symbols in
QtGui from the plugin which would make the link against QtGui
fail.

Change-Id: I23c67f97ca68f984b7a1603059c6f177fef60cca
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
---
 .../platforms/windows/qwindowsfontenginedirectwrite.cpp       | 11 +++++++----
 src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h |  4 ----
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
index 80f91ea5fd..e90c6b6048 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
@@ -614,11 +614,14 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t,
 }
 
 QImage QWindowsFontEngineDirectWrite::alphaRGBMapForGlyph(glyph_t t,
-                                                   QFixed subPixelPosition,
-                                                   int margin,
-                                                   const QTransform &xform)
+                                                          QFixed subPixelPosition,
+                                                          const QTransform &xform)
 {
-    QImage mask = imageForGlyph(t, subPixelPosition, margin, xform);
+    QImage mask = imageForGlyph(t,
+                                subPixelPosition,
+                                glyphMargin(QFontEngineGlyphCache::Raster_RGBMask),
+                                xform);
+
     return mask.depth() == 32
            ? mask
            : mask.convertToFormat(QImage::Format_RGB32);
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
index 0af52a2384..54594f2949 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
@@ -44,11 +44,7 @@
 
 #ifndef QT_NO_DIRECTWRITE
 
-// Enable access to HB_Face in harfbuzz includes included by qfontengine_p.h.
-#define QT_BUILD_GUI_LIB
 #include <QtGui/private/qfontengine_p.h>
-#undef QT_BUILD_GUI_LIB
-
 #include <QtCore/QSharedPointer>
 
 class QWindowsFontEngineData;
-- 
cgit v1.2.3