diff options
| author | Alex Raschi <raschi.alex@gmail.com> | 2019-05-07 17:23:44 +0200 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-11 18:34:37 +0000 |
| commit | 9d33cdd3a0e5306bfd4bd3a6b353d4344cf714a0 (patch) | |
| tree | d52fe403c8fb03b8b7347b694e6de56674a83fd4 /testing/telegram-desktop/tdesktop.patch | |
| parent | e3010b3374f7bc4a93c056e35c9bee3f6a5ec141 (diff) | |
| download | aports-9d33cdd3a0e5306bfd4bd3a6b353d4344cf714a0.tar.bz2 aports-9d33cdd3a0e5306bfd4bd3a6b353d4344cf714a0.tar.xz | |
testing/telegram-desktop: update to 1.6.7
Diffstat (limited to 'testing/telegram-desktop/tdesktop.patch')
| -rw-r--r-- | testing/telegram-desktop/tdesktop.patch | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/testing/telegram-desktop/tdesktop.patch b/testing/telegram-desktop/tdesktop.patch index 1fc6fcdf0c..2cb7f18f16 100644 --- a/testing/telegram-desktop/tdesktop.patch +++ b/testing/telegram-desktop/tdesktop.patch @@ -11,12 +11,12 @@ +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -39,9 +39,10 @@ void Launcher::init() { - QCoreApplication::setApplicationName(qsl("TelegramDesktop")); + QApplication::setApplicationName(qsl("TelegramDesktop")); -#ifndef OS_MAC_OLD +#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + // Retina display support is working fine, others are not. - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); + QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); -#endif // OS_MAC_OLD +#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 @@ -24,7 +24,7 @@ } @@ -59,6 +60,13 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started - Platform::start(); // must be started before QApplication is created + Platform::start(); // must be started before Sandbox is created + // I don't know why path is not in QT_PLUGIN_PATH by default + QCoreApplication::addLibraryPath("/usr/lib/qt5/plugins"); @@ -36,17 +36,6 @@ auto result = executeApplication(); DEBUG_LOG(("Telegram finished, result: %1").arg(result)); ---- a/Telegram/SourceFiles/platform/linux/linux_libs.h -+++ b/Telegram/SourceFiles/platform/linux/linux_libs.h -@@ -21,7 +21,7 @@ extern "C" { - } // extern "C" - - #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION --#include <unity/unity/unity.h> -+typedef void UnityLauncherEntry; - #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION - #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - --- /dev/null +++ b/Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ @@ -202,7 +191,7 @@ -#endif // OS_MAC_OLD +#endif ); - ev.setTimestamp(getms()); + ev.setTimestamp(crl::now()); QGuiApplication::sendEvent(windowHandle, &ev); --- a/Telegram/gyp/PrecompiledHeader.cmake +++ b/Telegram/gyp/PrecompiledHeader.cmake |