From 88b13ef7d8c7487f13cfa431b2ef0e9d0d1f2636 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Fri, 22 Nov 2013 09:18:59 +0200 Subject: Wayland-EGL QPA: Support desktop OpenGL as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no hard requirement on OpenGL ES 2 in this plugin, so allow Desktop OpenGL as well. Change-Id: I5b58f21c3640a4403dc6aa710838d4904d85f482 Reviewed-by: Lubomir Rintel Reviewed-by: Jørgen Lind --- config.tests/egl/egl.pro | 2 +- config.tests/wayland_egl/wayland_egl.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config.tests') diff --git a/config.tests/egl/egl.pro b/config.tests/egl/egl.pro index e96672e5..9886579b 100644 --- a/config.tests/egl/egl.pro +++ b/config.tests/egl/egl.pro @@ -1,7 +1,7 @@ TARGET = egl QT = core -!contains(QT_CONFIG, opengles2):error("wayland_egl support currently requires Qt configured with OpenGL ES2") +!contains(QT_CONFIG, opengl): error("wayland_egl support requires Qt configured with OpenGL") !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig diff --git a/config.tests/wayland_egl/wayland_egl.pro b/config.tests/wayland_egl/wayland_egl.pro index 0db9b04f..3b7fdfe5 100644 --- a/config.tests/wayland_egl/wayland_egl.pro +++ b/config.tests/wayland_egl/wayland_egl.pro @@ -1,7 +1,7 @@ TARGET = wayland_egl QT = core -!contains(QT_CONFIG, opengles2):error("wayland_egl support currently requires Qt configured with OpenGL ES2") +!contains(QT_CONFIG, opengl): error("wayland_egl support requires Qt configured with OpenGL") !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig -- cgit v1.2.1 From a66b1f17cdc9babb265ad40a4705833d490ffd42 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 22 Nov 2013 14:39:33 +0100 Subject: Only build Walyand EGL QPA if EGL is supported by base Change-Id: I1e6e39e177d4c173b6eedf2c311bcfe0f9693705 Reviewed-by: Andrew Knight --- config.tests/egl/egl.pro | 3 ++- config.tests/wayland_egl/wayland_egl.pro | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'config.tests') diff --git a/config.tests/egl/egl.pro b/config.tests/egl/egl.pro index 9886579b..402477db 100644 --- a/config.tests/egl/egl.pro +++ b/config.tests/egl/egl.pro @@ -1,7 +1,8 @@ TARGET = egl QT = core -!contains(QT_CONFIG, opengl): error("wayland_egl support requires Qt configured with OpenGL") +!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 diff --git a/config.tests/wayland_egl/wayland_egl.pro b/config.tests/wayland_egl/wayland_egl.pro index 3b7fdfe5..42d6b131 100644 --- a/config.tests/wayland_egl/wayland_egl.pro +++ b/config.tests/wayland_egl/wayland_egl.pro @@ -2,6 +2,7 @@ TARGET = wayland_egl QT = core !contains(QT_CONFIG, opengl): error("wayland_egl support requires Qt configured with OpenGL") +!contains(QT_CONFIG, egl): error("wayland_egl support requires Qt configured with EGL") !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig -- cgit v1.2.1 From 3970a4818786a3fc1cc2f60130dfdd602f109c69 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Mon, 6 Jan 2014 10:10:00 +0100 Subject: Config test for drm_egl_server Change-Id: Ib0ae4683374c2fd0c7386863ffb3c207605dc1e2 Reviewed-by: Jan Arne Petersen Reviewed-by: Laszlo Agocs --- config.tests/drm_egl_server/drm_egl_server.pro | 14 +++++++ config.tests/drm_egl_server/main.cpp | 52 ++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 config.tests/drm_egl_server/drm_egl_server.pro create mode 100644 config.tests/drm_egl_server/main.cpp (limited to 'config.tests') diff --git a/config.tests/drm_egl_server/drm_egl_server.pro b/config.tests/drm_egl_server/drm_egl_server.pro new file mode 100644 index 00000000..328354eb --- /dev/null +++ b/config.tests/drm_egl_server/drm_egl_server.pro @@ -0,0 +1,14 @@ +TARGET = drm_egl_server +QT = core + +!contains(QT_CONFIG, opengl): error("drm_egl_server support requires Qt configured with OpenGL") + +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += egl +} else { + LIBS += -legl +} + +# Input +SOURCES += main.cpp diff --git a/config.tests/drm_egl_server/main.cpp b/config.tests/drm_egl_server/main.cpp new file mode 100644 index 00000000..7ac62bd6 --- /dev/null +++ b/config.tests/drm_egl_server/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc and its Subsidiary(-ies) 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 +#include + +int main() +{ +#ifdef EGL_MESA_drm_image + return 0; +#else +#error Requires EGL_MESA_drm_image to be defined + return 1; +#endif +} -- cgit v1.2.1 From 10700eb19191879caf41bc188dca807b68a4146c Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 7 Jan 2014 14:46:04 +0100 Subject: Use xkb, not X11 for symbol defines. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6a6acbf83bd13d0a746dc65f560ace3e485ebb38 Reviewed-by: Jørgen Lind --- config.tests/xkbcommon/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config.tests') diff --git a/config.tests/xkbcommon/main.cpp b/config.tests/xkbcommon/main.cpp index 926a3a1a..801394c8 100644 --- a/config.tests/xkbcommon/main.cpp +++ b/config.tests/xkbcommon/main.cpp @@ -39,8 +39,7 @@ ****************************************************************************/ #include -#include - +#include #include int main() -- cgit v1.2.1