diff options
| -rw-r--r-- | src/plugins/platforms/xcb/qglxintegration.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 40 |
2 files changed, 18 insertions, 23 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp index bf58721d38..41bceaf406 100644 --- a/src/plugins/platforms/xcb/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/qglxintegration.cpp @@ -41,7 +41,6 @@ #include <QDebug> #include <QLibrary> -#include <QGLFormat> #include "qxcbwindow.h" #include "qxcbscreen.h" diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index ba36ab14fb..7700b4865c 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -53,29 +53,25 @@ contains(QT_CONFIG, xcb-render) { LIBS += -lxcb-render -lxcb-render-util } -contains(QT_CONFIG, opengl) { - QT += opengl - # DEFINES += XCB_USE_DRI2 - contains(DEFINES, XCB_USE_DRI2) { - LIBS += -lxcb-dri2 -lEGL - - CONFIG += link_pkgconfig - PKGCONFIG += libdrm - - HEADERS += qdri2context.h - SOURCES += qdri2context.cpp - - } else { - contains(QT_CONFIG, opengles2) { - DEFINES += XCB_USE_EGL - LIBS += -lEGL - HEADERS += qxcbeglsurface.h - } else:contains(QT_CONFIG, xcb-xlib) { - DEFINES += XCB_USE_GLX - HEADERS += qglxintegration.h - SOURCES += qglxintegration.cpp - } +contains(DEFINES, XCB_USE_DRI2) { + LIBS += -lxcb-dri2 -lEGL + + CONFIG += link_pkgconfig + PKGCONFIG += libdrm + + HEADERS += qdri2context.h + SOURCES += qdri2context.cpp + +} else { + contains(QT_CONFIG, opengles2) { + DEFINES += XCB_USE_EGL + LIBS += -lEGL + HEADERS += qxcbeglsurface.h + } else:contains(QT_CONFIG, xcb-xlib) { + DEFINES += XCB_USE_GLX + HEADERS += qglxintegration.h + SOURCES += qglxintegration.cpp } } |