diff options
author | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-02-23 14:33:57 +0100 |
---|---|---|
committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-02-24 19:42:21 +0000 |
commit | d37c353dc0f2ae5bb803fe9e5752eff846246439 (patch) | |
tree | 65cbef56b44d1ee6381b99cdb84f5e6611ee6b2d /src/platformsupport/glxconvenience | |
parent | b9c5c7139ea1054f69a1c43ca2cd7212206a41e5 (diff) |
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>
Diffstat (limited to 'src/platformsupport/glxconvenience')
-rw-r--r-- | src/platformsupport/glxconvenience/glxconvenience.pro | 1 | ||||
-rw-r--r-- | src/platformsupport/glxconvenience/qglxconvenience.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
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 { |