1 files changed, 10 insertions, 43 deletions

diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h
index 4656f46be5..62bfb4c634 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QXCBNATIVEINTERFACE_H
 #define QXCBNATIVEINTERFACE_H
@@ -45,6 +9,8 @@
 
 #include <QtCore/QRect>
 
+#include <QtGui/qguiapplication.h>
+
 #include "qxcbexport.h"
 #include "qxcbconnection.h"
 
@@ -54,11 +20,12 @@ class QXcbScreen;
 class QXcbNativeInterfaceHandler;
 
 class Q_XCB_EXPORT QXcbNativeInterface : public QPlatformNativeInterface
+    , public QNativeInterface::QX11Application
 {
     Q_OBJECT
 public:
     enum ResourceType {
-        Display,
+        XDisplay,
         Connection,
         Screen,
         AppTime,
@@ -109,9 +76,11 @@ public:
     void *startupId();
     void *x11Screen();
     void *rootWindow();
-    void *display();
+
+    Display *display() const override;
+    xcb_connection_t *connection() const override;
+
     void *atspiBus();
-    void *connection();
     static void setStartupId(const char *);
     static void setAppTime(QScreen *screen, xcb_timestamp_t time);
     static void setAppUserTime(QScreen *screen, xcb_timestamp_t time);
@@ -133,8 +102,6 @@ signals:
 private:
     const QByteArray m_nativeEventType = QByteArrayLiteral("xcb_generic_event_t");
 
-    xcb_atom_t m_sysTraySelectionAtom = XCB_ATOM_NONE;
-
     static QXcbScreen *qPlatformScreenForWindow(QWindow *window);
 
     QList<QXcbNativeInterfaceHandler *> m_handlers;