1 files changed, 17 insertions, 28 deletions
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index a5ac51f521..333f7f4e6a 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 //
 //  W A R N I N G
@@ -1670,6 +1645,16 @@ public:
     inline bool hasElementKerning() const { return m_children & Kerning; }
     void clearElementKerning();
 
+    inline QString elementHintingPreference() const { return m_hintingPreference; }
+    void setElementHintingPreference(const QString &a);
+    inline bool hasElementHintingPreference() const { return m_children & HintingPreference; }
+    void clearElementHintingPreference();
+
+    inline QString elementFontWeight() const { return m_fontWeight; }
+    void setElementFontWeight(const QString &a);
+    inline bool hasElementFontWeight() const { return m_children & FontWeight; }
+    void clearElementFontWeight();
+
 private:
 
     // child element data
@@ -1684,6 +1669,8 @@ private:
     bool m_antialiasing = false;
     QString m_styleStrategy;
     bool m_kerning = false;
+    QString m_hintingPreference;
+    QString m_fontWeight;
 
     enum Child {
         Family = 1,
@@ -1695,7 +1682,9 @@ private:
         StrikeOut = 64,
         Antialiasing = 128,
         StyleStrategy = 256,
-        Kerning = 512
+        Kerning = 512,
+        HintingPreference = 1024,
+        FontWeight = 2048
     };
 };