From 695733f520c8ba2da18cb85d38a8f758ba4f050f Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 17 Feb 2017 12:56:42 +0300 Subject: [PATCH] Alpha 1.0.10: fix clang/GCC and old OS X build. --- Telegram/SourceFiles/dialogswidget.cpp | 6 ++++++ Telegram/SourceFiles/ui/text/text.h | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp index 24a1e9381..575126dcc 100644 --- a/Telegram/SourceFiles/dialogswidget.cpp +++ b/Telegram/SourceFiles/dialogswidget.cpp @@ -78,6 +78,12 @@ DialogsInner::DialogsInner(QWidget *parent, QWidget *main) : SplittedWidget(pare , _a_pinnedShifting(animation(this, &DialogsInner::step_pinnedShifting)) , _addContactLnk(this, lang(lng_add_contact_button)) , _cancelSearchInPeer(this, st::dialogsCancelSearchInPeer) { + +#ifdef OS_MAC_OLD + // Qt 5.3.2 build is working with glitches otherwise. + setAttribute(Qt::WA_OpaquePaintEvent, false); +#endif // OS_MAC_OLD + if (Global::DialogsModeEnabled()) { _dialogsImportant = std_::make_unique(Dialogs::SortMode::Date); _importantSwitch = std_::make_unique(); diff --git a/Telegram/SourceFiles/ui/text/text.h b/Telegram/SourceFiles/ui/text/text.h index c7a25ae8d..17e21d2ea 100644 --- a/Telegram/SourceFiles/ui/text/text.h +++ b/Telegram/SourceFiles/ui/text/text.h @@ -134,7 +134,8 @@ public: }; Q_DECLARE_FLAGS(Flags, Flag); - StateRequest() = default; + StateRequest() { + } style::align align = style::al_left; Flags flags = Flag::LookupLink; @@ -150,7 +151,8 @@ public: return getState(rtl() ? (outerw - x - width) : x, y, width, request); } struct StateRequestElided : public StateRequest { - StateRequestElided() = default; + StateRequestElided() { + } StateRequestElided(const StateRequest &other) : StateRequest(other) { } int lines = 1;