svn commit: r379187 - head/x11-toolkits/qt5-gui/files

Alonso Schaich alonso at FreeBSD.org
Tue Feb 17 19:36:30 UTC 2015


Author: alonso
Date: Tue Feb 17 19:36:29 2015
New Revision: 379187
URL: https://svnweb.freebsd.org/changeset/ports/379187
QAT: https://qat.redports.org/buildarchive/r379187/

Log:
  Fix QSystemTray
  
  Add a patch found by PCBSD's Kris Moore <kris at pcbsd.org> that fixes
  QSystemTrayIcons on Desktops other than KDE.
  
  Provided by Kris via mailing list on 2015-01-29.
  
  Approved by:	rakuco (mentor)
  MFH:		2015Q1

Added:
  head/x11-toolkits/qt5-gui/files/
  head/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp   (contents, props changed)

Added: head/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp	Tue Feb 17 19:36:29 2015	(r379187)
@@ -0,0 +1,23 @@
+--- src/plugins/platforms/xcb/qxcbwindow.cpp.orig	2015-01-29 15:05:03.094563565 -0500
++++ src/plugins/platforms/xcb/qxcbwindow.cpp	2015-01-29 15:08:10.219554046 -0500
+@@ -701,6 +701,9 @@
+     if (connection()->time() != XCB_TIME_CURRENT_TIME)
+         updateNetWmUserTime(connection()->time());
+ 
++    if (window()->objectName() == QLatin1String("QSystemTrayIconSysWindow"))
++	return; // defer showing until XEMBED_EMBEDDED_NOTIFY
++
+     Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
+ 
+     if (QGuiApplication::modalWindow() == window())
+@@ -2130,7 +2133,10 @@
+     switch (event->data.data32[1]) {
+     case XEMBED_WINDOW_ACTIVATE:
+     case XEMBED_WINDOW_DEACTIVATE:
++	break;
+     case XEMBED_EMBEDDED_NOTIFY:
++	Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window));
++	m_screen->windowShown(this);
+         break;
+     case XEMBED_FOCUS_IN:
+         Qt::FocusReason reason;


More information about the svn-ports-head mailing list