diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 14:07:54 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-31 16:32:52 +0200 |
commit | 9cdf9973c60f6974fe9b405b10ef9cffef7ae4f2 (patch) | |
tree | 8736478eba95683a230cbfaba8b5f7dfb0304d07 /src/plugins/platforms/xcb/xcb.pro | |
parent | 071914232189735ae6475d44d07f11f90b4729a1 (diff) |
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>
Diffstat (limited to 'src/plugins/platforms/xcb/xcb.pro')
-rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 40 |
1 files changed, 18 insertions, 22 deletions
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 } } |