From 28d19a99e13578571e705f30ff765c6ec30d0fd4 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 24 Sep 2025 02:24:04 +0000 Subject: [PATCH] Fix build with Qt 6.10 --- .../media/view/media_view_overlay_widget.cpp | 5 +++-- .../SourceFiles/platform/linux/integration_linux.cpp | 11 +++-------- cmake | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp index 5ff6a060a39a41..e29a175420da37 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -2595,8 +2595,9 @@ void OverlayWidget::saveAs() { QFile(location.name()).copy(file); } else { QFile f(file); - f.open(QIODevice::WriteOnly); - f.write(bytes); + if (f.open(QIODevice::WriteOnly)) { + f.write(bytes); + } } if (_message) { auto &manager = Core::App().downloadManager(); diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp index 0bb06f5508ecb3..9ea29d6ba8a2ef 100644 --- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp @@ -177,15 +177,10 @@ LinuxIntegration::LinuxIntegration() QCoreApplication::eventDispatcher(), &QAbstractEventDispatcher::aboutToBlock, [] { - static auto timer = [] { - QElapsedTimer timer; - timer.start(); - return timer; - }(); - - if (timer.hasExpired(10000)) { + static auto since = crl::now(); + if (crl::now() - since >= 10000) { malloc_trim(0); - timer.start(); + since = crl::now(); } }); #endif // __GLIBC__ diff --git a/cmake b/cmake index 483a10954b0faf..682f1b57047aaa 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 483a10954b0fafa7f759a82847b066c44466074c +Subproject commit 682f1b57047aaab74ea42e265913baf697dd5a66