diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-16 11:18:36 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-20 13:02:48 +0000 |
commit | 5f4a893ea3c52cdac122f4aa10c495cb5c5d6d47 (patch) | |
tree | 869e1b458d8c42562703152d0d4c19d2af47c44d | |
parent | cd86e8b47383e03ce3d3baf166b2935475656c2e (diff) |
Remove old configure-related files
Remove the configure.json and configure.pri files that
were used for the qmake-based configure.
Remove the .prev_*.cmake files that were a by-product of
configurejson2cmake.py.
Task-number: QTBUG-89536
Change-Id: Iec9754c73c65999cdceb9f37a1fda617d9570e5f
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 10b686a003258d8a41629a89449cbe062770c471)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | configure.json | 5 | ||||
-rw-r--r-- | src/serialport/configure.json | 41 |
2 files changed, 0 insertions, 46 deletions
diff --git a/configure.json b/configure.json deleted file mode 100644 index fdfda244..00000000 --- a/configure.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "subconfigs": [ - "src/serialport" - ] -} diff --git a/src/serialport/configure.json b/src/serialport/configure.json deleted file mode 100644 index c969b863..00000000 --- a/src/serialport/configure.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "module": "serialport", - "condition": "!config.integrity && !config.vxworks && !config.winrt && !config.uikit && !config.wasm", - "depends": [ - "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" - ] - } - ] -} |