remove unused Xlib's XRender dependency

We do use xcb-xrender, and it has its own detection
logic in configure.json.

Change-Id: I20bbc1ddf5dd0c32e93ef2c12c7b0eda3f96f4f4
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

5 files changed, 2 insertions, 75 deletions

diff --git a/config.tests/x11/xrender/xrender.cpp b/config.tests/x11/xrender/xrender.cpp
deleted file mode 100644
index 223328a3df..0000000000
--- a/config.tests/x11/xrender/xrender.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests 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$
-**
-****************************************************************************/
-
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrender.h>
-
-#if RENDER_MAJOR == 0 && RENDER_MINOR < 5
-#  error "Required Xrender version 0.6 not found."
-#else
-int main(int, char **)
-{
-    XRenderPictFormat *format;
-    format = 0;
-    return 0;
-}
-#endif
diff --git a/config.tests/x11/xrender/xrender.pro b/config.tests/x11/xrender/xrender.pro
deleted file mode 100644
index ab5c5efa77..0000000000
--- a/config.tests/x11/xrender/xrender.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = xrender.cpp
-CONFIG += x11
-CONFIG -= qt
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 68bc43b5ca..81fa0db76f 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -43,8 +43,7 @@
             "xkb-config-root": "string",
             "xkbcommon": { "type": "enum", "values": [ "no", "qt", "system" ] },
             "xkbcommon-evdev": "boolean",
-            "xkbcommon-x11": { "type": "enum", "name": "xkbcommon", "values": [ "no", "qt", "system" ] },
-            "xrender": "boolean"
+            "xkbcommon-x11": { "type": "enum", "name": "xkbcommon", "values": [ "no", "qt", "system" ] }
         }
     },
 
@@ -285,13 +284,6 @@
             "sources": [
                 { "type": "pkgConfig", "args": "xkbcommon xkbcommon-x11 >= 0.4.1" }
             ]
-        },
-        "xrender": {
-            "label": "XRender",
-            "test": "x11/xrender",
-            "sources": [
-                "-lXrender"
-            ]
         }
     },
 
@@ -776,11 +768,6 @@
             "condition": "tests.xlib",
             "output": [ "privateFeature" ]
         },
-        "xrender": {
-            "label": "Xrender",
-            "condition": "libs.xrender",
-            "output": [ "privateFeature", "feature" ]
-        },
         "texthtmlparser": {
             "label": "HtmlParser",
             "purpose": "Provides a parser for HTML.",
@@ -1108,7 +1095,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
                     "section": "X11",
                     "condition": "features.xcb",
                     "entries": [
-                        "system-xcb", "egl_x11", "xinput2", "xkb", "xlib", "xrender", "xcb-render", "xcb-glx", "xcb-xlib", "xkbcommon-system"
+                        "system-xcb", "egl_x11", "xinput2", "xkb", "xlib", "xcb-render", "xcb-glx", "xcb-xlib", "xkbcommon-system"
                     ]
                 },
                 {
diff --git a/src/platformsupport/glxconvenience/glxconvenience.pro b/src/platformsupport/glxconvenience/glxconvenience.pro
index 185d6b0364..41c96d8f0d 100644
--- a/src/platformsupport/glxconvenience/glxconvenience.pro
+++ b/src/platformsupport/glxconvenience/glxconvenience.pro
@@ -7,7 +7,6 @@ CONFIG += static internal_module
 DEFINES += QT_NO_CAST_FROM_ASCII
 PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h
 
-qtConfig(xrender): QMAKE_USE_PRIVATE += xrender
 LIBS_PRIVATE += $$QMAKE_LIBS_X11
 
 HEADERS += qglxconvenience_p.h
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
index 4225bebf37..8c26550c1e 100644
--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
@@ -47,10 +47,6 @@
 #include <QtCore/QVector>
 #include <QtCore/QVarLengthArray>
 
-#ifndef QT_NO_XRENDER
-#include <X11/extensions/Xrender.h>
-#endif
-
 #include <GL/glxext.h>
 
 enum {