1 files changed, 29 insertions, 39 deletions

diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 5c6dead276..5b1b64d7ee 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 #ifndef QTEXTLAYOUT_H
 #define QTEXTLAYOUT_H
 
@@ -105,6 +69,17 @@ class QTextOption;
 class Q_GUI_EXPORT QTextLayout
 {
 public:
+    enum GlyphRunRetrievalFlag : quint16 {
+        RetrieveGlyphIndexes    = 0x1,
+        RetrieveGlyphPositions  = 0x2,
+        RetrieveStringIndexes   = 0x4,
+        RetrieveString          = 0x8,
+
+        DefaultRetrievalFlags   = RetrieveGlyphIndexes | RetrieveGlyphPositions,
+        RetrieveAll             = 0xffff
+    };
+    Q_DECLARE_FLAGS(GlyphRunRetrievalFlags, GlyphRunRetrievalFlag)
+
     // does itemization
     QTextLayout();
     QTextLayout(const QString& text);
@@ -184,7 +159,15 @@ public:
     qreal maximumWidth() const;
 
 #if !defined(QT_NO_RAWFONT)
+
+#  if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+    QList<QGlyphRun> glyphRuns(int from, int length, GlyphRunRetrievalFlags flags) const;
     QList<QGlyphRun> glyphRuns(int from = -1, int length = -1) const;
+#  else
+    QList<QGlyphRun> glyphRuns(int from = -1,
+                               int length = -1,
+                               GlyphRunRetrievalFlags flags = DefaultRetrievalFlags) const;
+#  endif
 #endif
 
     QTextEngine *engine() const { return d; }
@@ -202,7 +185,7 @@ private:
     QTextEngine *d;
 };
 Q_DECLARE_TYPEINFO(QTextLayout::FormatRange, Q_RELOCATABLE_TYPE);
-
+Q_DECLARE_OPERATORS_FOR_FLAGS(QTextLayout::GlyphRunRetrievalFlags)
 
 class Q_GUI_EXPORT QTextLine
 {
@@ -255,7 +238,14 @@ public:
     void draw(QPainter *painter, const QPointF &position) const;
 
 #if !defined(QT_NO_RAWFONT)
+#  if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+    QList<QGlyphRun> glyphRuns(int from, int length, QTextLayout::GlyphRunRetrievalFlags flags) const;
     QList<QGlyphRun> glyphRuns(int from = -1, int length = -1) const;
+#  else
+    QList<QGlyphRun> glyphRuns(int from = -1,
+                               int length = -1,
+                               QTextLayout::GlyphRunRetrievalFlags flags = QTextLayout::DefaultRetrievalFlags) const;
+#  endif
 #endif
 
 private: