Move the systemTrayVisualHasAlphaChannel to the QXcbSystemTrayTracker

also expose it through the QXcbScreenFunctions platform header and use
it in the qsystemtrayicon_x11.cpp. This gives us static typechecking.

Change-Id: Ia9e2e2563ed5994be0b19d7bcf5a6aca92b1b760
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index b9b67c1df2..2752c56c65 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -53,6 +53,7 @@
 #include <qdebug.h>
 
 #include <QtPlatformHeaders/qxcbwindowfunctions.h>
+#include <QtPlatformHeaders/qxcbintegrationfunctions.h>
 #ifndef QT_NO_SYSTEMTRAYICON
 QT_BEGIN_NAMESPACE
 
@@ -113,10 +114,7 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *qIn)
     // window to ParentRelative (so that it inherits the background of its X11 parent window), call
     // xcb_clear_region before painting (so that the inherited background is visible) and then grab
     // the just-drawn background from the X11 server.
-    bool hasAlphaChannel = false;
-    QMetaObject::invokeMethod(QGuiApplication::platformNativeInterface(),
-                              "systrayVisualHasAlphaChannel", Qt::DirectConnection,
-                              Q_RETURN_ARG(bool, hasAlphaChannel));
+    bool hasAlphaChannel = QXcbIntegrationFunctions::xEmbedSystemTrayVisualHasAlphaChannel();
     setAttribute(Qt::WA_TranslucentBackground, hasAlphaChannel);
     if (!hasAlphaChannel) {
         createWinId();