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 /config.tests | |
parent | 51abcc7460da76bd64d4336dcf253c571b820e71 (diff) | |
download | qtwayland-4d3c3a08eba8d30805f18397c98e19ab9fd40722.tar.gz |
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 'config.tests')
-rw-r--r-- | config.tests/egl/egl.pro | 15 | ||||
-rw-r--r-- | config.tests/egl/main.cpp | 47 |
2 files changed, 0 insertions, 62 deletions
diff --git a/config.tests/egl/egl.pro b/config.tests/egl/egl.pro deleted file mode 100644 index 402477db..00000000 --- a/config.tests/egl/egl.pro +++ /dev/null @@ -1,15 +0,0 @@ -TARGET = egl -QT = core - -!contains(QT_CONFIG, opengl): error("egl support requires Qt configured with OpenGL") -!contains(QT_CONFIG, egl): error("egl support requires Qt configured with EGL") - -!contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG += egl -} else { - LIBS += -lEGL -} - -# Input -SOURCES += main.cpp diff --git a/config.tests/egl/main.cpp b/config.tests/egl/main.cpp deleted file mode 100644 index a47358e6..00000000 --- a/config.tests/egl/main.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Compositor. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <EGL/egl.h> - -int main(int argc, char **argv) -{ - EGLDisplay display = eglGetDisplay(0); - return 0; -} |