1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linking on systems where there's no libGLX.so but mesa provides bindings

Browse Source 
Behave like qmake and link against libGL simply. This happened in
offscreen.pro implicitly through QT += gui-private and needs to happen
explicitly here by using the CONFIG += opengl equivalent: WrapOpenGL.

Change-Id: I396c2256c89f4560bb7f936f7540b33c754b9eda
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Simon Hausmann 2019-05-03 10:15:34 +02:00
parent 64b31cafa1
commit c2379c469c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platformsupport/glxconvenience/CMakeLists.txt
View File

@ -1,5 +1,5 @@
qt_find_package(X11) # special case qt_find_package(X11) # special case
qt_find_package(OpenGL) # special case qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL) # special case
##################################################################### #####################################################################
## GlxSupport Module: ## GlxSupport Module:
@ -12,7 +12,7 @@ add_qt_module(GlxSupport
DEFINES DEFINES
QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_ASCII
LIBRARIES LIBRARIES
OpenGL::GLX # special case WrapOpenGL # special case
Qt::CorePrivate Qt::CorePrivate
Qt::GuiPrivate Qt::GuiPrivate
X11::X11 # special case X11::X11 # special case