From ad2de6b6a50b1b1c4d98b85ca55da54bcdc17cb4 Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@gmail.com>
Date: Mon, 2 Dec 2019 21:47:55 +0300
Subject: [PATCH] [tools,qt] Replace deprecated Qt methods

---
 src/tools/qttxf/mainwindow.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/tools/qttxf/mainwindow.cpp b/src/tools/qttxf/mainwindow.cpp
index 039b9e01..46121eaf 100644
--- a/src/tools/qttxf/mainwindow.cpp
+++ b/src/tools/qttxf/mainwindow.cpp
@@ -303,7 +303,7 @@ MainWindow::buildTxf(const QFont& font, QDataStream& out, int texWidth, int texH
 
     // Sort the glyphs by height so that they pack more compactly
     // into the available space.
-    qSort(glyphInfoList);
+    std::sort(glyphInfoList.begin(), glyphInfoList.end());
 
     if (glyphInfoList.isEmpty())
     {
@@ -361,7 +361,11 @@ MainWindow::buildTxf(const QFont& font, QDataStream& out, int texWidth, int texH
         out << (quint16) info.ch.unicode();
         out << (quint8) (bounds.width() + 2) << (quint8) (bounds.height() + 2);
         out << (qint8) bounds.left() << (qint8) (-bounds.bottom());
+#if QT_VERSION >= 0x051100
+        out << (qint8) fm.horizontalAdvance(info.ch);
+#else
         out << (qint8) fm.width(info.ch);
+#endif
         out << (quint8) 0;   /* unused */
         out << (quint16) (x - 1) << (quint16) (texHeight - y - 2);