1 files changed, 13 insertions, 32 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp
index a41e5f8f38..15767c2805 100644
--- a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp
+++ b/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -80,6 +80,11 @@ QFont QWinRTFontDatabase::defaultFont() const
     return QFont(QStringLiteral("Segoe UI"));
 }
 
+bool QWinRTFontDatabase::fontsAlwaysScalable() const
+{
+    return true;
+}
+
 void QWinRTFontDatabase::populateFontDatabase()
 {
     ComPtr<IDWriteFactory1> factory;
@@ -204,31 +209,7 @@ void QWinRTFontDatabase::populateFamily(const QString &familyName)
             }
         }
 
-        QFont::Weight weight;
-        switch (font->GetWeight()) {
-        case DWRITE_FONT_WEIGHT_THIN:
-        case DWRITE_FONT_WEIGHT_EXTRA_LIGHT:
-        case DWRITE_FONT_WEIGHT_LIGHT:
-        case DWRITE_FONT_WEIGHT_SEMI_LIGHT:
-            weight = QFont::Light;
-            break;
-        default:
-        case DWRITE_FONT_WEIGHT_NORMAL:
-        case DWRITE_FONT_WEIGHT_MEDIUM:
-            weight = QFont::Normal;
-            break;
-        case DWRITE_FONT_WEIGHT_DEMI_BOLD:
-            weight = QFont::DemiBold;
-            break;
-        case DWRITE_FONT_WEIGHT_BOLD:
-        case DWRITE_FONT_WEIGHT_EXTRA_BOLD:
-            weight = QFont::Bold;
-            break;
-        case DWRITE_FONT_WEIGHT_BLACK:
-        case DWRITE_FONT_WEIGHT_EXTRA_BLACK:
-            weight = QFont::Black;
-            break;
-        }
+        QFont::Weight weight = QPlatformFontDatabase::weightFromInteger(font->GetWeight());
 
         QFont::Style style;
         switch (font->GetStyle()) {