AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove the LIBS from platformsupport"

Browse Source 
This reverts commit cd6e90c70a.

Prevent symbol lookup error when requesting alpha visuals with GLX in
the xcb plugin. This means other plugins will also link against
-lXrender, but we need this workaround for now.

Change-Id: I2fd2c63bc577c2497060a555c91d72337723b931
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
This commit is contained in:
Samuel Rødal 2012-03-20 09:17:18 +01:00 committed by Qt by Nokia
parent 1ae2a0227a
commit 7a169fb52a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/platformsupport/glxconvenience/glxconvenience.pri
View File

@ -1,5 +1,6 @@
contains(QT_CONFIG,xlib):contains(QT_CONFIG,xrender) { contains(QT_CONFIG,xlib):contains(QT_CONFIG,xrender) {
contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) { contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) {
LIBS += $$QMAKE_LIBS_X11 -lXrender
HEADERS += $$PWD/qglxconvenience_p.h HEADERS += $$PWD/qglxconvenience_p.h
SOURCES += $$PWD/qglxconvenience.cpp SOURCES += $$PWD/qglxconvenience.cpp
} }

1
src/platformsupport/udev/udev.pri
View File

@ -3,4 +3,5 @@ contains(QT_CONFIG, libudev) {
SOURCES += $$PWD/qudevicehelper.cpp SOURCES += $$PWD/qudevicehelper.cpp
INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
LIBS += -ludev
} }