[Qt] Monospace font does not render in proper sizes
authorallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Apr 2013 12:35:36 +0000 (12:35 +0000)
committerallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 Apr 2013 12:35:36 +0000 (12:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=93263

Reviewed by Jocelyn Turcotte.

Remove this patch's artificial dependency on Qt 5.1.

* platform/graphics/qt/FontPlatformDataQt.cpp:
(WebCore::FontPlatformData::FontPlatformData):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp

index 15f476d..046fbac 100644 (file)
@@ -1,3 +1,15 @@
+2013-04-03  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Monospace font does not render in proper sizes
+        https://bugs.webkit.org/show_bug.cgi?id=93263
+
+        Reviewed by Jocelyn Turcotte.
+
+        Remove this patch's artificial dependency on Qt 5.1.
+
+        * platform/graphics/qt/FontPlatformDataQt.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2013-04-03  Takeshi Yoshino  <tyoshino@chromium.org>
 
         Refine LOG messages in WebSocket related components
index 0674371..8bcd310 100644 (file)
@@ -73,10 +73,7 @@ FontPlatformData::FontPlatformData(const FontDescription& description, const Ato
     font.setWeight(toQFontWeight(description.weight()));
     font.setWordSpacing(wordSpacing);
     font.setLetterSpacing(QFont::AbsoluteSpacing, letterSpacing);
-#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
-    // To maintain stable baselines for Qt 5.0, keep force integer metrics enabled and ignore font-smoothing setting.
-    font.setStyleStrategy(QFont::ForceIntegerMetrics);
-#else
+#if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)
     if (description.fontSmoothing() == NoSmoothing
         || (description.fontSmoothing() == AutoSmoothing && !Font::shouldUseSmoothing()))
         font.setStyleStrategy(QFont::NoAntialias);