From ba7eb7316d8586c6a30e759c26fed30c5b0ff5ae Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Wed, 18 Sep 2019 08:58:24 +0200
Subject: Port ntddmodm config test to new configure system
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib8c633534df0cf025b8d9845de6322b8285e73c1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
---
 config.tests/ntddmodm/main.cpp     | 47 --------------------------------------
 config.tests/ntddmodm/ntddmodm.pro |  4 ----
 configure.json                     |  5 ++--
 src/serialport/configure.json      | 42 ++++++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 53 deletions(-)
 delete mode 100644 config.tests/ntddmodm/main.cpp
 delete mode 100644 config.tests/ntddmodm/ntddmodm.pro
 create mode 100644 src/serialport/configure.json

diff --git a/config.tests/ntddmodm/main.cpp b/config.tests/ntddmodm/main.cpp
deleted file mode 100644
index a881f87..0000000
--- a/config.tests/ntddmodm/main.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Denis Shienkov <denis.shienkov@gmail.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtSerialPort module 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 <windows.h>
-#include <ntddmodm.h>
-
-int main(int, char**)
-{
-    GUID guid = GUID_DEVINTERFACE_MODEM;
-    return 0;
-}
diff --git a/config.tests/ntddmodm/ntddmodm.pro b/config.tests/ntddmodm/ntddmodm.pro
deleted file mode 100644
index abb9ba8..0000000
--- a/config.tests/ntddmodm/ntddmodm.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG -= qt
-CONFIG += console
-
-SOURCES += main.cpp
diff --git a/configure.json b/configure.json
index 1685700..fdfda24 100644
--- a/configure.json
+++ b/configure.json
@@ -1,4 +1,5 @@
 {
-    "module": "serialport",
-    "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm"
+    "subconfigs": [
+         "src/serialport"
+    ]
 }
diff --git a/src/serialport/configure.json b/src/serialport/configure.json
new file mode 100644
index 0000000..f0e6c76
--- /dev/null
+++ b/src/serialport/configure.json
@@ -0,0 +1,42 @@
+{
+    "module": "serialport",
+    "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm",
+    "depends": [
+            "core"
+    ],
+    "condition": "module.core",
+
+    "tests": {
+        "ntddmodm": {
+            "label": "ntddmodm",
+            "type": "compile",
+            "test": {
+                "include": [ "windows.h", "ntddmodm.h"],
+                "main": [
+                    "GUID guid = GUID_DEVINTERFACE_MODEM;"
+                ]
+            }
+        }
+    },
+
+    "features": {
+        "ntddmodm": {
+            "label": "ntddmodm",
+            "disable": "input.ntddmodm == 'no'",
+            "condition": "tests.ntddmodm",
+            "output": [
+                "privateFeature",
+                { "type": "define", "negative": true, "name": "QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM" }
+            ]
+        }
+    },
+
+    "summary": [
+        {
+            "section": "Serial Port",
+            "entries": [
+                "ntddmodm"
+            ]
+        }
+    ]
+}
-- 
cgit v1.2.1