summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-24 09:35:24 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-24 09:41:57 (GMT)
commitd7594cbb83f223ec4a56ba3d999412a1c0185937 (patch)
treee9ff703ef9e914337cf0e5d18d4e219a30bfec33 /src
parentbbdc68b95bcec6e1a369df6b99df8ea499284d21 (diff)
downloadQt-d7594cbb83f223ec4a56ba3d999412a1c0185937.zip
Qt-d7594cbb83f223ec4a56ba3d999412a1c0185937.tar.gz
Qt-d7594cbb83f223ec4a56ba3d999412a1c0185937.tar.bz2
Added missing -lX11 to xpixmap_glx wayland integration.
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xpixmap_glx/xpixmap_glx.pri2
-rw-r--r--src/plugins/platforms/wayland/wayland.pro1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/xpixmap_glx.pri b/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/xpixmap_glx.pri
index 07654df..2b6ae0d 100644
--- a/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/xpixmap_glx.pri
+++ b/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/xpixmap_glx.pri
@@ -8,3 +8,5 @@ SOURCES += \
$$PWD/qwaylandxpixmapglxintegration.cpp \
gl_integration/xpixmap_glx/qwaylandxpixmapglxwindow.cpp \
gl_integration/xpixmap_glx/qwaylandxpixmapglxcontext.cpp
+
+LIBS += -lX11
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 45457fc..e5c866b 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -39,7 +39,6 @@ contains(QT_CONFIG, opengl) {
CONFIG += wayland_egl
#CONFIG += xpixmap_egl
} else {
- message("HELLO")
CONFIG += xpixmap_glx
}