diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-08 00:18:21 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-11 13:22:40 +0000 |
commit | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (patch) | |
tree | 48ac4f501c278067571004f0562bf487a798925f /src/hardwareintegration/client/brcm-egl | |
parent | 51abcc7460da76bd64d4336dcf253c571b820e71 (diff) |
Get rid of the egl config test and use what qtbase provides
contains(QT_CONFIG, egl) and CONFIG += egl is the only sane way to test
for and pull in EGL headers and libs. This is particularly important when
trying to be robust and guard against half-broken sysroots on embedded
where a naive PKGCONFIG += egl breaks.
Also add an EGL_WAYLAND_BUFFER_WL define to keep wayland-egl compiling.
We are not testing for that in any config tests may cause a failure in sysroots
that have parts of Mesa thrown in but pick ip an older EGL header from the
vendor's driver.
Change-Id: I7b7e6a7a91e78dbda5b6954ad08761298c538efc
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/hardwareintegration/client/brcm-egl')
-rw-r--r-- | src/hardwareintegration/client/brcm-egl/brcm-egl.pri | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri index eb8e450f9..c4ccdcc6e 100644 --- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri @@ -7,12 +7,7 @@ contains(QT_CONFIG, no-pkg-config) { LIBS += -lwayland-client } -for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p -} - -LIBS += $$QMAKE_LIBS_EGL -INCLUDEPATH += $$QMAKE_INCDIR_EGL +CONFIG += egl SOURCES += $$PWD/qwaylandbrcmeglintegration.cpp \ $$PWD/qwaylandbrcmglcontext.cpp \ |