diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-12-09 12:03:54 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-12-09 16:15:32 +0100 |
| commit | 78ac2ecad415327d26efb4bfa8aa25cf72a23778 (patch) | |
| tree | a2dfe77150fec34b8e611fb39535a8ce73e9c3af | |
| parent | 238709d55c2b13d1c106cf07c901f0575f7da03a (diff) | |
Remove unused qt_internal_extend_target for SerialPort target
QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM definition is already
set using qt_feature_definition. Also config_ntddmodm seems
never defined, so whole codeblock is never used.
Also remove the NEGATE option from the existing definition. If the
feature is enabled, that means 'TEST_ntddmodm' passes, and we were
able to compile the test with the included ntddmodm.h.
QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM also enables the branch that
includes ntddmodm.h and supposed to not redefine
GUID_DEVINTERFACE_MODEM.
Change-Id: I54fcb52803fc061d7ac664c602b6750f1c379b60
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/serialport/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/serialport/configure.cmake | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/serialport/CMakeLists.txt b/src/serialport/CMakeLists.txt index 8c7863a1..9e44f7e2 100644 --- a/src/serialport/CMakeLists.txt +++ b/src/serialport/CMakeLists.txt @@ -22,11 +22,6 @@ qt_internal_add_module(SerialPort ## Scopes: ##################################################################### -qt_internal_extend_target(SerialPort CONDITION config_ntddmodm - DEFINES - QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM -) - qt_internal_extend_target(SerialPort CONDITION QT_FEATURE_libudev AND UNIX DEFINES LINK_LIBUDEV diff --git a/src/serialport/configure.cmake b/src/serialport/configure.cmake index a9ce0492..6b283912 100644 --- a/src/serialport/configure.cmake +++ b/src/serialport/configure.cmake @@ -37,7 +37,7 @@ qt_feature("ntddmodm" PRIVATE CONDITION TEST_ntddmodm DISABLE INPUT_ntddmodm STREQUAL 'no' ) -qt_feature_definition("ntddmodm" "QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM" NEGATE) +qt_feature_definition("ntddmodm" "QT_NO_REDEFINE_GUID_DEVINTERFACE_MODEM") qt_configure_add_summary_section(NAME "Serial Port") qt_configure_add_summary_entry(ARGS "ntddmodm") qt_configure_end_summary_section() # end of "Serial Port" section |