File libqt5-remove-stray-dbus-menu-dependency-from-x... of Package libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File libqt5-remove-stray-dbus-menu-dependency-from-xcb-plugin.patch of Package libqt5-qtbase

From 7b4c52c7e65cd1eb01e29b98d247f47d04465968 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 29 Sep 2016 19:22:39 +0200
Subject: [PATCH] remove stray dbus/-menu dependency from xcb plugin

amends 26a05fc09 (which in turn was a cleanup of 38abd6537).

Change-Id: I6159a3cfe468db048faf1c396143dd3869f7e72b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 src/plugins/platforms/xcb/qxcbnativeinterface.cpp | 4 ----
 src/plugins/platforms/xcb/qxcbnativeinterface.h   | 1 -
 src/plugins/platforms/xcb/xcb_qpa_lib.pro         | 3 ---
 3 files changed, 8 deletions(-)

--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -50,10 +50,6 @@
 #include <QtPlatformHeaders/qxcbintegrationfunctions.h>
 #include <QtPlatformHeaders/qxcbscreenfunctions.h>
 
-#ifndef QT_NO_DBUS
-#include "QtPlatformSupport/private/qdbusmenuconnection_p.h"
-#endif
-
 #ifdef XCB_USE_XLIB
 #  include <X11/Xlib.h>
 #else
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
@@ -47,7 +47,6 @@ class QWidget;
 class QXcbScreen;
 class QXcbConnection;
 class QXcbNativeInterfaceHandler;
-class QDBusMenuConnection;
 
 class Q_XCB_EXPORT QXcbNativeInterface : public QPlatformNativeInterface
 {
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -79,11 +79,6 @@ QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB
 
 CONFIG += qpa/genericunixfontdatabase
 
-contains(QT_CONFIG, dbus-linked) {
-    QT += dbus
-    LIBS += $$QT_LIBS_DBUS
-}
-
 contains(QT_CONFIG, xcb-qt) {
     DEFINES += XCB_USE_RENDER
     XCB_DIR = ../../../3rdparty/xcb

Places

File libqt5-remove-stray-dbus-menu-dependency-from-xcb-plugin.patch of Package libqt5-qtbase

Places