diff options
-rw-r--r-- | examples/serialport/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/serialport/serialport.pro | 2 | ||||
-rw-r--r-- | tests/manual/CMakeLists.txt | 7 | ||||
-rw-r--r-- | tests/manual/examples/receiver/CMakeLists.txt (renamed from examples/serialport/receiver/CMakeLists.txt) | 12 | ||||
-rw-r--r-- | tests/manual/examples/receiver/dialog.cpp (renamed from examples/serialport/receiver/dialog.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/receiver/dialog.h (renamed from examples/serialport/receiver/dialog.h) | 0 | ||||
-rw-r--r-- | tests/manual/examples/receiver/main.cpp (renamed from examples/serialport/receiver/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/receiver/receiver.pro (renamed from examples/serialport/receiver/receiver.pro) | 3 | ||||
-rw-r--r-- | tests/manual/examples/sender/CMakeLists.txt (renamed from examples/serialport/sender/CMakeLists.txt) | 10 | ||||
-rw-r--r-- | tests/manual/examples/sender/dialog.cpp (renamed from examples/serialport/sender/dialog.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/sender/dialog.h (renamed from examples/serialport/sender/dialog.h) | 0 | ||||
-rw-r--r-- | tests/manual/examples/sender/main.cpp (renamed from examples/serialport/sender/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/examples/sender/sender.pro (renamed from examples/serialport/sender/sender.pro) | 3 |
13 files changed, 9 insertions, 32 deletions
diff --git a/examples/serialport/CMakeLists.txt b/examples/serialport/CMakeLists.txt index a771a68c..dd3d50d0 100644 --- a/examples/serialport/CMakeLists.txt +++ b/examples/serialport/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2022 The Qt Company Ltd. +# Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause qt_internal_add_example(creaderasync) @@ -7,6 +7,4 @@ if(TARGET Qt::Widgets) qt_internal_add_example(terminal) qt_internal_add_example(blockingsender) qt_internal_add_example(blockingreceiver) - qt_internal_add_example(sender) - qt_internal_add_example(receiver) endif() diff --git a/examples/serialport/serialport.pro b/examples/serialport/serialport.pro index 98d9d7e0..ed6656b6 100644 --- a/examples/serialport/serialport.pro +++ b/examples/serialport/serialport.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS = creaderasync cwriterasync -!isEmpty(QT.widgets.name):SUBDIRS += terminal blockingsender blockingreceiver sender receiver +!isEmpty(QT.widgets.name):SUBDIRS += terminal blockingsender blockingreceiver diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt new file mode 100644 index 00000000..3057e843 --- /dev/null +++ b/tests/manual/CMakeLists.txt @@ -0,0 +1,7 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +if(TARGET Qt::Widgets) + add_subdirectory(examples/sender) + add_subdirectory(examples/receiver) +endif() diff --git a/examples/serialport/receiver/CMakeLists.txt b/tests/manual/examples/receiver/CMakeLists.txt index f929a465..0063c20d 100644 --- a/examples/serialport/receiver/CMakeLists.txt +++ b/tests/manual/examples/receiver/CMakeLists.txt @@ -4,12 +4,6 @@ cmake_minimum_required(VERSION 3.16) project(receiver LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialport/receiver") - find_package(Qt6 REQUIRED COMPONENTS Core Gui SerialPort Widgets) qt_standard_project_setup() @@ -30,9 +24,3 @@ target_link_libraries(receiver PRIVATE Qt::SerialPort Qt::Widgets ) - -install(TARGETS receiver - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/serialport/receiver/dialog.cpp b/tests/manual/examples/receiver/dialog.cpp index 51e18ea8..51e18ea8 100644 --- a/examples/serialport/receiver/dialog.cpp +++ b/tests/manual/examples/receiver/dialog.cpp diff --git a/examples/serialport/receiver/dialog.h b/tests/manual/examples/receiver/dialog.h index a32e1480..a32e1480 100644 --- a/examples/serialport/receiver/dialog.h +++ b/tests/manual/examples/receiver/dialog.h diff --git a/examples/serialport/receiver/main.cpp b/tests/manual/examples/receiver/main.cpp index f08a0eed..f08a0eed 100644 --- a/examples/serialport/receiver/main.cpp +++ b/tests/manual/examples/receiver/main.cpp diff --git a/examples/serialport/receiver/receiver.pro b/tests/manual/examples/receiver/receiver.pro index 3842f505..d3180061 100644 --- a/examples/serialport/receiver/receiver.pro +++ b/tests/manual/examples/receiver/receiver.pro @@ -10,6 +10,3 @@ HEADERS += \ SOURCES += \ main.cpp \ dialog.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/serialport/receiver -INSTALLS += target diff --git a/examples/serialport/sender/CMakeLists.txt b/tests/manual/examples/sender/CMakeLists.txt index 2fa11cb8..efbd5551 100644 --- a/examples/serialport/sender/CMakeLists.txt +++ b/tests/manual/examples/sender/CMakeLists.txt @@ -4,10 +4,6 @@ cmake_minimum_required(VERSION 3.16) project(sender LANGUAGES CXX) -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialport/sender") find_package(Qt6 REQUIRED COMPONENTS Core Gui SerialPort Widgets) @@ -30,9 +26,3 @@ target_link_libraries(sender PRIVATE Qt::SerialPort Qt::Widgets ) - -install(TARGETS sender - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/serialport/sender/dialog.cpp b/tests/manual/examples/sender/dialog.cpp index d19ec888..d19ec888 100644 --- a/examples/serialport/sender/dialog.cpp +++ b/tests/manual/examples/sender/dialog.cpp diff --git a/examples/serialport/sender/dialog.h b/tests/manual/examples/sender/dialog.h index 0f049950..0f049950 100644 --- a/examples/serialport/sender/dialog.h +++ b/tests/manual/examples/sender/dialog.h diff --git a/examples/serialport/sender/main.cpp b/tests/manual/examples/sender/main.cpp index f08a0eed..f08a0eed 100644 --- a/examples/serialport/sender/main.cpp +++ b/tests/manual/examples/sender/main.cpp diff --git a/examples/serialport/sender/sender.pro b/tests/manual/examples/sender/sender.pro index 83cb7be8..f5fc421f 100644 --- a/examples/serialport/sender/sender.pro +++ b/tests/manual/examples/sender/sender.pro @@ -10,6 +10,3 @@ HEADERS += \ SOURCES += \ main.cpp \ dialog.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/serialport/sender -INSTALLS += target |