From 317b9e9c5fd4ba318658cce2bdef3ef82e1dd288 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 29 Oct 2015 14:11:29 +0100 Subject: Support for Wayland servers on i.MX6 A wayland compositor on i.MX6 needs to create the wl_display before creating the EGL display. This wl_display then needs to be exposed so that QWaylandCompositor can use it. Change-Id: Id60f6dd2fbba05140ca0671da6f17dbc2ecce3a3 Reviewed-by: Laszlo Agocs --- config.tests/qpa/wayland-server/wayland-server.pro | 5 +++ config.tests/qpa/wayland-server/wl.cpp | 40 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 config.tests/qpa/wayland-server/wayland-server.pro create mode 100644 config.tests/qpa/wayland-server/wl.cpp (limited to 'config.tests') diff --git a/config.tests/qpa/wayland-server/wayland-server.pro b/config.tests/qpa/wayland-server/wayland-server.pro new file mode 100644 index 0000000000..c07740d20f --- /dev/null +++ b/config.tests/qpa/wayland-server/wayland-server.pro @@ -0,0 +1,5 @@ +SOURCES = wl.cpp + +CONFIG -= qt +CONFIG += link_pkgconfig +PKGCONFIG += wayland-server diff --git a/config.tests/qpa/wayland-server/wl.cpp b/config.tests/qpa/wayland-server/wl.cpp new file mode 100644 index 0000000000..ba1756af57 --- /dev/null +++ b/config.tests/qpa/wayland-server/wl.cpp @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +int main(int, char **) +{ + wl_display_create(); + return 0; +} -- cgit v1.2.3