diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-03-20 09:17:18 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 14:43:45 +0100 |
| commit | 7a169fb52a2d57ec6b3b8e6196e5d4ce084e3eb0 (patch) | |
| tree | 7518fbffb5b6277a96c3779a4ce4e3e1da9ef83b /src/platformsupport | |
| parent | 1ae2a0227a3717714444b5b7153c6b63dce016d9 (diff) | |
Revert "Remove the LIBS from platformsupport"
This reverts commit cd6e90c70ac13065257422088ffa01537ed9c685.
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>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/glxconvenience/glxconvenience.pri | 1 | ||||
| -rw-r--r-- | src/platformsupport/udev/udev.pri | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/glxconvenience/glxconvenience.pri b/src/platformsupport/glxconvenience/glxconvenience.pri index 6915f8db4e..3632f45b54 100644 --- a/src/platformsupport/glxconvenience/glxconvenience.pri +++ b/src/platformsupport/glxconvenience/glxconvenience.pri @@ -1,5 +1,6 @@ contains(QT_CONFIG,xlib):contains(QT_CONFIG,xrender) { contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2) { + LIBS += $$QMAKE_LIBS_X11 -lXrender HEADERS += $$PWD/qglxconvenience_p.h SOURCES += $$PWD/qglxconvenience.cpp } diff --git a/src/platformsupport/udev/udev.pri b/src/platformsupport/udev/udev.pri index e22be2c363..c00fa72ba8 100644 --- a/src/platformsupport/udev/udev.pri +++ b/src/platformsupport/udev/udev.pri @@ -3,4 +3,5 @@ contains(QT_CONFIG, libudev) { SOURCES += $$PWD/qudevicehelper.cpp INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV + LIBS += -ludev } |