summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-07-13 20:26:46 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-12-17 21:30:19 +0000
commit10adbc4f0f2d60bc714b304266865bebcce0f909 (patch)
tree9e249f63dc17535c7f003b7a8a1b953fb93a460a
parentc15afc16ac0d71f1b61ad6154df3a7994e18cc26 (diff)
configure: inline corewlan test
we have support for objc++ since 591edbb11. Change-Id: I5f430fd7c410913d4532627d18529b077f794035 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--config.tests/corewlan/corewlan.pro1
-rw-r--r--config.tests/corewlan/corewlantest.mm47
-rw-r--r--src/network/configure.json6
3 files changed, 5 insertions, 49 deletions
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 <CoreWLAN/CoreWLAN.h>
-#include <CoreWLAN/CWInterface.h>
-
-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"
]