From c6727e673d6aadeb1ec85aed6cf630bc756a6dd9 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 8 Aug 2022 09:39:59 +0300 Subject: [PATCH] Revert "Fix packaged build" This reverts commit 4689c896e201cc2863d629eac58306a0b561a71c. --- ui/platform/linux/ui_linux_wayland_integration.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp index 1de34fd..bcbfa53 100644 --- a/ui/platform/linux/ui_linux_wayland_integration.cpp +++ b/ui/platform/linux/ui_linux_wayland_integration.cpp @@ -12,11 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "waylandshells/xdg_shell.h" #include "qwayland-xdg-shell.h" -// must be before QtPlugin include -#ifndef QT_STATICPLUGIN -#define QT_STATICPLUGIN -#endif // !QT_STATICPLUGIN - #include #include #include @@ -29,6 +24,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define slots Q_SLOTS #endif // QT_NO_KEYWORDS +#ifndef QT_STATICPLUGIN +#define QT_STATICPLUGIN +#endif // !QT_STATICPLUGIN + #include #include #include @@ -71,9 +70,8 @@ public: QRect geometry() const override { if (!_settingGeometry) { - if (window()->inherits("QWidgetWindow")) { - const auto widgetWindow = static_cast( - window()); + if (const auto widgetWindow = qobject_cast( + window())) { return widgetWindow->widget()->geometry(); } }