From 7d81159ccf8d489ef1ae71c2684b9038927e5534 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 13 Jul 2020 07:25:37 +0400
Subject: [PATCH] Move QTextItemInt symbols to lib_ui

---
 Telegram/CMakeLists.txt               |  4 +-
 Telegram/SourceFiles/qt_functions.cpp | 73 ---------------------------
 Telegram/lib_ui                       |  2 +-
 3 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 Telegram/SourceFiles/qt_functions.cpp

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index b34fb28a0..f2be39eb9 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1129,9 +1129,7 @@ if (NOT LINUX)
     )
 endif()
 
-if (DESKTOP_APP_USE_PACKAGED)
-    nice_target_sources(Telegram ${src_loc} PRIVATE qt_functions.cpp)
-else()
+if (NOT DESKTOP_APP_USE_PACKAGED)
     nice_target_sources(Telegram ${src_loc} PRIVATE platform/mac/mac_iconv_helper.c)
 endif()
 
diff --git a/Telegram/SourceFiles/qt_functions.cpp b/Telegram/SourceFiles/qt_functions.cpp
deleted file mode 100644
index 9067963ed..000000000
--- a/Telegram/SourceFiles/qt_functions.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file contains some parts of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 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
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** 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$
-**
-****************************************************************************/
-
-// For QTextItemInt declaraion
-#include <private/qtextengine_p.h>
-
-/* TODO: find a dynamic library with these symbols. */
-
-/* Debian maintainer: this constructor is taken from qtextengine.cpp for TextPainter::drawLine */
-QTextItemInt::QTextItemInt(const QGlyphLayout &g, QFont *font, const QChar *chars_, int numChars, QFontEngine *fe, const QTextCharFormat &format)
-    : flags(0), justified(false), underlineStyle(QTextCharFormat::NoUnderline), charFormat(format),
-      num_chars(numChars), chars(chars_), logClusters(0), f(font),  glyphs(g), fontEngine(fe)
-{
-}
-
-/* Debian maintainer: this method is also taken from qtextengine.cpp */
-// Fix up flags and underlineStyle with given info
-void QTextItemInt::initWithScriptItem(const QScriptItem &si)
-{
-    // explicitly initialize flags so that initFontAttributes can be called
-    // multiple times on the same TextItem
-    flags = 0;
-    if (si.analysis.bidiLevel %2)
-        flags |= QTextItem::RightToLeft;
-    ascent = si.ascent;
-    descent = si.descent;
-
-    if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
-        underlineStyle = charFormat.underlineStyle();
-    } else if (charFormat.boolProperty(QTextFormat::FontUnderline)
-               || f->d->underline) {
-        underlineStyle = QTextCharFormat::SingleUnderline;
-    }
-
-    // compat
-    if (underlineStyle == QTextCharFormat::SingleUnderline)
-        flags |= QTextItem::Underline;
-
-    if (f->d->overline || charFormat.fontOverline())
-        flags |= QTextItem::Overline;
-    if (f->d->strikeOut || charFormat.fontStrikeOut())
-        flags |= QTextItem::StrikeOut;
-}
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fffdce5cb..88a4a27d8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fffdce5cb52d16796e394425760063c6e9838ef7
+Subproject commit 88a4a27d8e5d02b83b5487d5f156bf45e7ae14ee