diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-05 16:23:10 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-06 09:35:35 +0000 |
commit | c01f1c9a5e823078f5e3a3bb3bf50f80ba2ed31e (patch) | |
tree | b072335715d655d451eeb1bf474856dc6c1ed767 | |
parent | d023a49a53432ba1dd83bbfaa76bef0a5b85d7ae (diff) |
Configure tests for Mir
Change-Id: Ia60a8cba37aa690c687417c6f8b5c13249eb6986
Reviewed-by: Gerry Boland <gerry.boland@canonical.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r-- | config.tests/qpa/mirclient/mirclient.cpp | 47 | ||||
-rw-r--r-- | config.tests/qpa/mirclient/mirclient.pro | 4 | ||||
-rwxr-xr-x | configure | 13 |
3 files changed, 60 insertions, 4 deletions
diff --git a/config.tests/qpa/mirclient/mirclient.cpp b/config.tests/qpa/mirclient/mirclient.cpp new file mode 100644 index 0000000000..c7148e82f9 --- /dev/null +++ b/config.tests/qpa/mirclient/mirclient.cpp @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** 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 <mir_toolkit/mir_client_library.h> +#include <ubuntu/application/lifecycle_delegate.h> +#include <EGL/egl.h> + +static void surfaceCreateCallback(MirSurface*, void*) +{ +} + + +int main(int, char **) +{ + u_application_lifecycle_delegate_new(); + mir_surface_create(0, surfaceCreateCallback, 0); +} diff --git a/config.tests/qpa/mirclient/mirclient.pro b/config.tests/qpa/mirclient/mirclient.pro new file mode 100644 index 0000000000..b397c2d08a --- /dev/null +++ b/config.tests/qpa/mirclient/mirclient.pro @@ -0,0 +1,4 @@ +SOURCES = mirclient.cpp +CONFIG += link_pkgconfig +PKGCONFIG += egl mirclient ubuntu-platform-api +CONFIG -= qt @@ -688,7 +688,7 @@ CFG_EGLFS_VIV=no CFG_DIRECTFB=auto CFG_LINUXFB=auto CFG_KMS=auto -CFG_MIRCLIENT=no +CFG_MIRCLIENT=auto CFG_LIBUDEV=auto CFG_LIBINPUT=auto CFG_OBSOLETE_WAYLAND=no @@ -5537,9 +5537,14 @@ fi if [ "$CFG_MIRCLIENT" != "no" ]; then # TODO: implement configure tests for Mir - if [ "$CFG_MIRCLIENT" = "yes" ]; then - echo " Turning on Mir support without testing functionality." - echo " If Mir dependencies are not installed, the build will abort later." + if compileTest qpa/mirclient "Mir client"; then + CFG_MIRCLIENT=yes + elif [ "$CFG_MIRCLIENT" = "yes" ]; then + echo " Mir client support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 else CFG_MIRCLIENT=no fi |