From 10adbc4f0f2d60bc714b304266865bebcce0f909 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 13 Jul 2018 20:26:46 +0200 Subject: configure: inline corewlan test we have support for objc++ since 591edbb11. Change-Id: I5f430fd7c410913d4532627d18529b077f794035 Reviewed-by: Joerg Bornemann --- config.tests/corewlan/corewlan.pro | 1 - config.tests/corewlan/corewlantest.mm | 47 ----------------------------------- src/network/configure.json | 6 ++++- 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 config.tests/corewlan/corewlan.pro delete mode 100644 config.tests/corewlan/corewlantest.mm diff --git a/config.tests/corewlan/corewlan.pro b/config.tests/corewlan/corewlan.pro deleted file mode 100644 index c19f0be4fd..0000000000 --- a/config.tests/corewlan/corewlan.pro +++ /dev/null @@ -1 +0,0 @@ -OBJECTIVE_SOURCES = corewlantest.mm diff --git a/config.tests/corewlan/corewlantest.mm b/config.tests/corewlan/corewlantest.mm deleted file mode 100644 index 73b4d0d145..0000000000 --- a/config.tests/corewlan/corewlantest.mm +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main() -{ - [CWInterface interfaceWithName:@"en2"]; - return 0; -} diff --git a/src/network/configure.json b/src/network/configure.json index 076a1c24a7..e823ed9d2f 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -26,7 +26,11 @@ "corewlan": { "label": "CoreWLan", "export": "", - "test": "corewlan", + "test": { + "lang": "objc++", + "main": "[CWInterface interfaceWithName:@\"en2\"];" + }, + "headers": [ "CoreWLAN/CoreWLAN.h", "CoreWLAN/CWInterface.h" ], "sources": [ "-framework CoreWLAN -framework Foundation" ] -- cgit v1.2.3