whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The XCB plugin should not rely on QT_CONFIG=opengl anymore 

Change-Id: Ieeedb7eb68704df811c613873bd2fc4b77e2aa04
Reviewed-on: http://codereview.qt.nokia.com/3966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
bb10
Gunnar Sletta 2011-08-31 14:07:54 +02:00 committed by Lars Knoll
parent 0719142321
commit 9cdf9973c6
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/xcb/qglxintegration.cpp
View File

@ -41,7 +41,6 @@
#include <QDebug>
#include <QLibrary>
#include <QGLFormat>
#include "qxcbwindow.h"
#include "qxcbscreen.h"

34
src/plugins/platforms/xcb/xcb.pro
View File

@ -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
contains(DEFINES, XCB_USE_DRI2) {
LIBS += -lxcb-dri2 -lEGL
CONFIG += link_pkgconfig
PKGCONFIG += libdrm
CONFIG += link_pkgconfig
PKGCONFIG += libdrm
HEADERS += qdri2context.h
SOURCES += qdri2context.cpp
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
}
} 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
}
}