summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-22 21:58:37 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-22 21:58:45 +0200
commit2111bf00fef0185d70d3247e74c2c57080711ee0 (patch)
tree276558c07b3f22e4e5905ab093dc71e02df24fe9 /src/plugins/platforms/windows
parent53f0b43a4bfa65ad62bb0c144bab7236ad322b8c (diff)
parent881bda9e6ecdd8729edf7df68f94f72f5d7c9042 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r--src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
index f6d911d646..49eb7cfdec 100644
--- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
@@ -447,7 +447,7 @@ glyph_metrics_t QWindowsFontEngineDirectWrite::boundingBox(glyph_t g)
width,
height,
advanceWidth,
- advanceHeight);
+ 0);
} else {
qErrnoWarning("%s: GetDesignGlyphMetrics failed", __FUNCTION__);
}