68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
From 9202a047d23b8077a55b93e3d1c9e5fba73b3d10 Mon Sep 17 00:00:00 2001
|
|
From: John Zimmermann <johnz@posteo.net>
|
|
Date: Fri, 9 Aug 2019 22:25:34 +0200
|
|
Subject: [PATCH] Revert "Change some private header includes."
|
|
|
|
This reverts commit b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.
|
|
---
|
|
Telegram/SourceFiles/ui/text/text.cpp | 1 -
|
|
Telegram/SourceFiles/ui/text/text.h | 2 +-
|
|
Telegram/SourceFiles/ui/text/text_block.cpp | 2 --
|
|
Telegram/SourceFiles/ui/text/text_block.h | 2 +-
|
|
4 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git Telegram/SourceFiles/ui/text/text.cpp Telegram/SourceFiles/ui/text/text.cpp
|
|
index 99d27b60c..ba0b4844f 100644
|
|
--- Telegram/SourceFiles/ui/text/text.cpp
|
|
+++ Telegram/SourceFiles/ui/text/text.cpp
|
|
@@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|
#include "boxes/confirm_box.h"
|
|
#include "mainwindow.h"
|
|
|
|
-#include <private/qfontengine_p.h>
|
|
#include <private/qharfbuzz_p.h>
|
|
|
|
namespace Ui {
|
|
diff --git Telegram/SourceFiles/ui/text/text.h Telegram/SourceFiles/ui/text/text.h
|
|
index 537c0b60d..7906b0eee 100644
|
|
--- Telegram/SourceFiles/ui/text/text.h
|
|
+++ Telegram/SourceFiles/ui/text/text.h
|
|
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|
#include "core/click_handler.h"
|
|
#include "base/flags.h"
|
|
|
|
-#include <private/qfixed_p.h>
|
|
+#include <private/qfontengine_p.h>
|
|
|
|
static const QChar TextCommand(0x0010);
|
|
enum TextCommands {
|
|
diff --git Telegram/SourceFiles/ui/text/text_block.cpp Telegram/SourceFiles/ui/text/text_block.cpp
|
|
index c7b3fdead..9637a2e07 100644
|
|
--- Telegram/SourceFiles/ui/text/text_block.cpp
|
|
+++ Telegram/SourceFiles/ui/text/text_block.cpp
|
|
@@ -9,8 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|
|
|
#include "core/crash_reports.h"
|
|
|
|
-#include <private/qfontengine_p.h>
|
|
-
|
|
// COPIED FROM qtextlayout.cpp AND MODIFIED
|
|
namespace Ui {
|
|
namespace Text {
|
|
diff --git Telegram/SourceFiles/ui/text/text_block.h Telegram/SourceFiles/ui/text/text_block.h
|
|
index a20b8123c..38e1e0446 100644
|
|
--- Telegram/SourceFiles/ui/text/text_block.h
|
|
+++ Telegram/SourceFiles/ui/text/text_block.h
|
|
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
|
*/
|
|
#pragma once
|
|
|
|
-#include <private/qfixed_p.h>
|
|
+#include <private/qfontengine_p.h>
|
|
|
|
namespace Ui {
|
|
namespace Text {
|
|
--
|
|
2.22.0
|
|
|