diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-07 16:17:29 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-07 16:18:32 +0200 |
commit | 2346ae167568bb9e5d247da0b946067b7f9aad48 (patch) | |
tree | f3a975711bcd223f4d6803caa5b53c080bb68819 /src/platformsupport | |
parent | 5dd2713c8ba98e06ae5c4f3da44b2ed73121d247 (diff) | |
parent | 730bc064a070e886e10950ccfd59780e8976f5fd (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I9ee4176f0a0078908d49896508826154c9f71530
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/glxconvenience/glxconvenience.pri | 5 |
1 files changed, 3 insertions, 2 deletions
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 } |