Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl

Change-Id: Ic73491112903aacf1c9fbccbb8b92497928491cf

3 files changed, 5 insertions, 50 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 5e6fec74..259b036a 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
 
-MODULE_VERSION = 5.15.10
+MODULE_VERSION = 5.15.11
diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp
index aee0f100..8484d181 100644
--- a/src/virtualkeyboard/desktopinputpanel.cpp
+++ b/src/virtualkeyboard/desktopinputpanel.cpp
@@ -37,10 +37,6 @@
 #include <QQmlEngine>
 #include <QScreen>
 #include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
-#if defined(QT_VIRTUALKEYBOARD_HAVE_XCB)
-#include <xcb/xcb.h>
-#include <xcb/xfixes.h>
-#endif
 #include <qpa/qplatformnativeinterface.h>
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/QLibraryInfo>
@@ -225,18 +221,6 @@ void DesktopInputPanel::previewVisibleChanged()
         updateInputRegion();
 }
 
-#if defined(QT_VIRTUALKEYBOARD_HAVE_XCB)
-static inline xcb_rectangle_t qRectToXCBRectangle(const QRect &r)
-{
-    xcb_rectangle_t result;
-    result.x = qMax(SHRT_MIN, r.x());
-    result.y = qMax(SHRT_MIN, r.y());
-    result.width = qMin((int)USHRT_MAX, r.width());
-    result.height = qMin((int)USHRT_MAX, r.height());
-    return result;
-}
-#endif
-
 void DesktopInputPanel::updateInputRegion()
 {
     Q_D(DesktopInputPanel);
@@ -248,36 +232,11 @@ void DesktopInputPanel::updateInputRegion()
     if (!d->view->handle())
         d->view->create();
 
-    switch (d->windowingSystem) {
-    case DesktopInputPanelPrivate::Xcb:
-#if defined(QT_VIRTUALKEYBOARD_HAVE_XCB)
-        {
-            QVector<xcb_rectangle_t> rects;
-            rects.push_back(qRectToXCBRectangle(d->keyboardRect.toRect()));
-            if (d->previewVisible && !d->previewRect.isEmpty())
-                rects.push_back(qRectToXCBRectangle(d->previewRect.toRect()));
-
-            QWindow *window = d->view.data();
-            QPlatformNativeInterface *platformNativeInterface = QGuiApplication::platformNativeInterface();
-            xcb_connection_t *xbcConnection = static_cast<xcb_connection_t *>(platformNativeInterface->nativeResourceForWindow("connection", window));
-            xcb_xfixes_region_t xbcRegion = xcb_generate_id(xbcConnection);
-            xcb_xfixes_create_region(xbcConnection, xbcRegion, rects.size(), rects.constData());
-            xcb_xfixes_set_window_shape_region(xbcConnection, window->winId(), XCB_SHAPE_SK_INPUT, 0, 0, xbcRegion);
-            xcb_xfixes_destroy_region(xbcConnection, xbcRegion);
-        }
-#endif
-        break;
+    QRegion inputRegion(d->keyboardRect.toRect());
+    if (d->previewVisible && !d->previewRect.isEmpty())
+        inputRegion += d->previewRect.toRect();
 
-    default:
-        {
-            QRegion inputRegion(d->keyboardRect.toRect());
-            if (d->previewVisible && !d->previewRect.isEmpty())
-                inputRegion += d->previewRect.toRect();
-
-            d->view->setMask(inputRegion);
-            break;
-        }
-    }
+    d->view->setMask(inputRegion);
 }
 
 } // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index cb28d6a1..03ed74f4 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -405,10 +405,6 @@ OTHER_FILES += \
     SOURCES += desktopinputpanel.cpp inputview.cpp
     HEADERS += desktopinputpanel_p.h inputview_p.h
     DEFINES += QT_VIRTUALKEYBOARD_DESKTOP
-    !no-pkg-config:packagesExist(xcb) {
-        PKGCONFIG += xcb xcb-xfixes
-        DEFINES += QT_VIRTUALKEYBOARD_HAVE_XCB
-    }
 }
 
 record-trace-input {