AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QGtk3Dialog: don't crash on Wayland

Browse Source 
Check if it's an X11 window before calling XSetTransientForHint().
No transient parent will be set for GTK+ dialogs on Wayland. That
has to be implemented separately.

Task-number: QTBUG-55583
Change-Id: Iabc2a72681c8157bb2f2fe500892853aa397106b
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
J-P Nurmi 2016-12-06 16:30:31 +01:00 committed by Jani Heikkinen
parent 181860e1af
commit 84ea00d470
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
View File

@ -135,11 +135,13 @@ bool QGtk3Dialog::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWind
GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget); GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget);
if (parent) { if (parent) {
if (GDK_IS_X11_WINDOW(gdkWindow)) {
GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow); GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow);
XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay), XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay),
gdk_x11_window_get_xid(gdkWindow), gdk_x11_window_get_xid(gdkWindow),
parent->winId()); parent->winId());
} }
}
if (modality != Qt::NonModal) { if (modality != Qt::NonModal) {
gdk_window_set_modal_hint(gdkWindow, true); gdk_window_set_modal_hint(gdkWindow, true);