From 5ca5f4d344f6eb644a9b56f8b1ad166582bb8483 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 29 Aug 2013 20:43:50 +0200
Subject: build glxconvenience also without Xrender

it contains #ifdefs for that, no need to disable it completely.

Change-Id: I4a7d03e09fefded966e2c3fec58a470b4f1d3300
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
---
 src/platformsupport/glxconvenience/glxconvenience.pri | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/glxconvenience/glxconvenience.pri b/src/platformsupport/glxconvenience/glxconvenience.pri
index d325f5adf9..cc5b198f6c 100644
--- a/src/platformsupport/glxconvenience/glxconvenience.pri
+++ b/src/platformsupport/glxconvenience/glxconvenience.pri
@@ -1,6 +1,7 @@
-contains(QT_CONFIG,xlib):contains(QT_CONFIG,xrender) {
+contains(QT_CONFIG, xlib) {
     contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) {
-        LIBS_PRIVATE += $$QMAKE_LIBS_X11 -lXrender
+        contains(QT_CONFIG, xrender): LIBS_PRIVATE += -lXrender
+        LIBS_PRIVATE += $$QMAKE_LIBS_X11
         HEADERS += $$PWD/qglxconvenience_p.h
         SOURCES += $$PWD/qglxconvenience.cpp
     }
-- 
cgit v1.2.3