diff options
author | Michal Klocek <michal.klocek@qt.io> | 2019-08-07 17:37:08 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2019-08-15 07:57:57 +0200 |
commit | b92aa117eb84a4023eca7f9e4def7a71f603b586 (patch) | |
tree | 1086d24a245bf25d3764e4dd226fb0f12f4409de | |
parent | 63b6f748f1073599845d57ee4f73aecad8182a33 (diff) |
Move libvpx test to configure
Change-Id: I669b9d4cc28765b134386752d1fc14d14fa5b1dc
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | config.tests/libvpx/libvpx.cpp | 41 | ||||
-rw-r--r-- | config.tests/libvpx/libvpx.pro | 4 | ||||
-rw-r--r-- | src/core/configure.json | 22 |
3 files changed, 16 insertions, 51 deletions
diff --git a/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp deleted file mode 100644 index 06c34476b..000000000 --- a/config.tests/libvpx/libvpx.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <vpx/vpx_encoder.h> - -int main(int, char **) -{ - vpx_codec_cx_pkt pkt; - // Members added (as ints) by - // https://chromium-review.googlesource.com/c/webm/libvpx/+/798222 - // And changed to int arrays by - // https://chromium-review.googlesource.com/c/webm/libvpx/+/879089 - pkt.data.frame.width[0] = 0u; - pkt.data.frame.height[0] = 0u; - return 0; -} diff --git a/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro deleted file mode 100644 index 13ce13647..000000000 --- a/config.tests/libvpx/libvpx.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES += libvpx.cpp -CONFIG += link_pkgconfig -PKGCONFIG += vpx -CONFIG -= qt diff --git a/src/core/configure.json b/src/core/configure.json index 0ee556cfb..3e7968d41 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -268,6 +268,21 @@ "sources": [ { "type": "pkgConfig", "args": "x11" } ] + }, + "webengine-libvpx": { + "label": "libvpx", + "test": { + "main": [ + "vpx_codec_cx_pkt pkt;", + "pkt.data.frame.width[0] = 0u;", + "pkt.data.frame.height[0] = 0u;" + ] + }, + "headers": "vpx/vpx_encoder.h", + "sources": [ + { "type": "pkgConfig", "args": "vpx" }, + "-lvpx" + ] } }, "tests" : { @@ -282,11 +297,6 @@ "test": "khr", "type": "compile" }, - "webengine-libvpx": { - "label": "libvpx", - "test": "libvpx", - "type": "compile" - }, "webengine-winversion": { "label": "winversion", "test": "winversion", @@ -513,7 +523,7 @@ }, "webengine-system-libvpx" : { "label": "libvpx", - "condition": "config.unix && tests.webengine-libvpx", + "condition": "config.unix && libs.webengine-libvpx", "output": [ "privateFeature" ] }, "webengine-system-snappy" : { |