From 4689c896e201cc2863d629eac58306a0b561a71c Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 5 Aug 2022 14:45:42 +0400 Subject: [PATCH] Fix packaged build --- ui/platform/linux/ui_linux_wayland_integration.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp index bcbfa53..1de34fd 100644 --- a/ui/platform/linux/ui_linux_wayland_integration.cpp +++ b/ui/platform/linux/ui_linux_wayland_integration.cpp @@ -12,6 +12,11 @@ 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 @@ -24,10 +29,6 @@ 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 @@ -70,8 +71,9 @@ public: QRect geometry() const override { if (!_settingGeometry) { - if (const auto widgetWindow = qobject_cast( - window())) { + if (window()->inherits("QWidgetWindow")) { + const auto widgetWindow = static_cast( + window()); return widgetWindow->widget()->geometry(); } }