diff options
88 files changed, 843 insertions, 453 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000..213991f --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.1.0") diff --git a/.qmake.conf b/.qmake.conf index a93cfcc..d841a0b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 6.0.0 +MODULE_VERSION = 6.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..a7ae0c0 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.16) + +include(.cmake.conf) +project(QtSerialBus + VERSION "${QT_REPO_MODULE_VERSION}" + DESCRIPTION "Qt SerialBus Libraries" + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C +) + +if(WASM) + message(NOTICE "Skipping the build as the condition \"NOT WASM\" is not met.") + return() +endif() +if(INTEGRITY) + message(NOTICE "Skipping the build as the condition \"NOT INTEGRITY\" is not met.") + return() +endif() +if(VXWORKS) + message(NOTICE "Skipping the build as the condition \"NOT VXWORKS\" is not met.") + return() +endif() +if(WINRT) + message(NOTICE "Skipping the build as the condition \"NOT WINRT\" is not met.") + return() +endif() +if(UIKIT) + message(NOTICE "Skipping the build as the condition \"NOT UIKIT\" is not met.") + return() +endif() +if(EMSCRIPTEN) + message(NOTICE "Skipping the build as the condition \"NOT EMSCRIPTEN\" is not met.") + return() +endif() + +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Gui Widgets SerialPort) + +qt_build_repo() diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..16d158c --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,12 @@ +version: 2 +accept_configuration: + condition: property + property: features + not_contains_value: Disable + +instructions: + Build: + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + + Test: + - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" diff --git a/config.tests/socketcan/CMakeLists.txt b/config.tests/socketcan/CMakeLists.txt new file mode 100644 index 0000000..7dce09a --- /dev/null +++ b/config.tests/socketcan/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.14.0) +project(config_test_socketcan LANGUAGES C CXX) + +foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES}) + find_package(${p}) +endforeach() + +if(QT_CONFIG_COMPILE_TEST_LIBRARIES) + link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES}) +endif() +if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS) + foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS}) + if(TARGET ${lib}) + link_libraries(${lib}) + endif() + endforeach() +endif() + +add_executable(${PROJECT_NAME} + main.cpp +) diff --git a/config.tests/socketcan/socketcan.pro b/config.tests/socketcan/socketcan.pro deleted file mode 100644 index 3f6c643..0000000 --- a/config.tests/socketcan/socketcan.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += main.cpp - diff --git a/config.tests/socketcan_fd/CMakeLists.txt b/config.tests/socketcan_fd/CMakeLists.txt new file mode 100644 index 0000000..210fefc --- /dev/null +++ b/config.tests/socketcan_fd/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.14.0) +project(config_test_socketcan_fd LANGUAGES C CXX) + +foreach(p ${QT_CONFIG_COMPILE_TEST_PACKAGES}) + find_package(${p}) +endforeach() + +if(QT_CONFIG_COMPILE_TEST_LIBRARIES) + link_libraries(${QT_CONFIG_COMPILE_TEST_LIBRARIES}) +endif() +if(QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS) + foreach(lib ${QT_CONFIG_COMPILE_TEST_LIBRARY_TARGETS}) + if(TARGET ${lib}) + link_libraries(${lib}) + endif() + endforeach() +endif() + +add_executable(${PROJECT_NAME} + main.cpp +) diff --git a/config.tests/socketcan_fd/socketcan_fd.pro b/config.tests/socketcan_fd/socketcan_fd.pro deleted file mode 100644 index 3f6c643..0000000 --- a/config.tests/socketcan_fd/socketcan_fd.pro +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += main.cpp - diff --git a/configure.cmake b/configure.cmake new file mode 100644 index 0000000..53e3f11 --- /dev/null +++ b/configure.cmake @@ -0,0 +1,21 @@ + + +#### Inputs + + + +#### Libraries + + + +#### Tests + + + +#### Features + + +qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC) +qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC) +qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC) +qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC) diff --git a/dependencies.yaml b/dependencies.yaml index f2fb88d..bfbb8d8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 871392790eafdd22521367ba485da5c10e9bb0db + ref: ad84332f2bbe10601ba4c21fd6d4a446d16ed94c required: true ../qtserialport: - ref: cfc375388d6f38374984b1cf46e61606c8360335 + ref: 6a14f2a56866c6ff636f6e0619ca5d6b479f9fea required: false diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 0000000..090f623 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,11 @@ +qt_examples_build_begin() + +if(NOT TARGET Qt::Widgets) + return() +endif() +if(NOT TARGET Qt::SerialBus) + return() +endif() +add_subdirectory(serialbus) + +qt_examples_build_end() diff --git a/examples/serialbus/CMakeLists.txt b/examples/serialbus/CMakeLists.txt new file mode 100644 index 0000000..fc06deb --- /dev/null +++ b/examples/serialbus/CMakeLists.txt @@ -0,0 +1,4 @@ +if(TARGET Qt::Widgets) + add_subdirectory(can) + add_subdirectory(modbus) +endif() diff --git a/examples/serialbus/can/CMakeLists.txt b/examples/serialbus/can/CMakeLists.txt new file mode 100644 index 0000000..0f24732 --- /dev/null +++ b/examples/serialbus/can/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.14) +project(can LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/can") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS SerialBus) +find_package(Qt6 COMPONENTS Widgets) + +qt_add_executable(can + bitratebox.cpp bitratebox.h + connectdialog.cpp connectdialog.h connectdialog.ui + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + sendframebox.cpp sendframebox.h sendframebox.ui +) +set_target_properties(can PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_link_libraries(can PUBLIC + Qt::Core + Qt::Gui + Qt::SerialBus + Qt::Widgets +) + + +# Resources: +set(can_resource_files + "images/application-exit.png" + "images/clear.png" + "images/connect.png" + "images/disconnect.png" +) + +qt6_add_resources(can "can" + PREFIX + "/" + FILES + ${can_resource_files} +) + +install(TARGETS can + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/serialbus/modbus/CMakeLists.txt b/examples/serialbus/modbus/CMakeLists.txt new file mode 100644 index 0000000..8d63950 --- /dev/null +++ b/examples/serialbus/modbus/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(master) +add_subdirectory(slave) +if(QT_FEATURE_modbus_serialport) + add_subdirectory(adueditor) +endif() + diff --git a/examples/serialbus/modbus/adueditor/CMakeLists.txt b/examples/serialbus/modbus/adueditor/CMakeLists.txt new file mode 100644 index 0000000..73919dd --- /dev/null +++ b/examples/serialbus/modbus/adueditor/CMakeLists.txt @@ -0,0 +1,51 @@ +cmake_minimum_required(VERSION 3.14) +project(adueditor LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/adueditor") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS SerialBus) +find_package(Qt6 COMPONENTS SerialPort) +find_package(Qt6 COMPONENTS Widgets) + +qt_add_executable(adueditor + interface.ui + main.cpp + mainwindow.cpp mainwindow.h + modbustcpclient.cpp modbustcpclient.h modbustcpclient_p.h + plaintextedit.h +) +set_target_properties(adueditor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(adueditor PUBLIC + . +) + +target_link_libraries(adueditor PUBLIC + Qt::Core + Qt::CorePrivate + Qt::Gui + Qt::SerialBus + Qt::SerialBusPrivate + Qt::SerialPort + Qt::Widgets +) + +install(TARGETS adueditor + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/serialbus/modbus/master/CMakeLists.txt b/examples/serialbus/modbus/master/CMakeLists.txt new file mode 100644 index 0000000..e7c2900 --- /dev/null +++ b/examples/serialbus/modbus/master/CMakeLists.txt @@ -0,0 +1,64 @@ +cmake_minimum_required(VERSION 3.14) +project(modbusmaster LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/master") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS SerialBus) +find_package(Qt6 COMPONENTS Widgets) + +qt_add_executable(modbusmaster + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + settingsdialog.cpp settingsdialog.h settingsdialog.ui + writeregistermodel.cpp writeregistermodel.h +) +set_target_properties(modbusmaster PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_link_libraries(modbusmaster PUBLIC + Qt::Core + Qt::Gui + Qt::SerialBus + Qt::Widgets +) + + +# Resources: +set(master_resource_files + "images/application-exit.png" + "images/connect.png" + "images/disconnect.png" + "images/settings.png" +) + +qt6_add_resources(modbusmaster "master" + PREFIX + "/" + FILES + ${master_resource_files} +) + +if(QT_FEATURE_modbus_serialport) + target_link_libraries(modbusmaster PUBLIC + Qt::SerialPort + ) +endif() + +install(TARGETS modbusmaster + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/serialbus/modbus/slave/CMakeLists.txt b/examples/serialbus/modbus/slave/CMakeLists.txt new file mode 100644 index 0000000..69c18cf --- /dev/null +++ b/examples/serialbus/modbus/slave/CMakeLists.txt @@ -0,0 +1,63 @@ +cmake_minimum_required(VERSION 3.14) +project(modbusslave LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/slave") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS SerialBus) +find_package(Qt6 COMPONENTS Widgets) + +qt_add_executable(modbusslave + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + settingsdialog.cpp settingsdialog.h settingsdialog.ui +) +set_target_properties(modbusslave PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_link_libraries(modbusslave PUBLIC + Qt::Core + Qt::Gui + Qt::SerialBus + Qt::Widgets +) + + +# Resources: +set(slave_resource_files + "images/application-exit.png" + "images/connect.png" + "images/disconnect.png" + "images/settings.png" +) + +qt6_add_resources(modbusslave "slave" + PREFIX + "/" + FILES + ${slave_resource_files} +) + +if(QT_FEATURE_modbus_serialport) + target_link_libraries(modbusslave PUBLIC + Qt::SerialPort + ) +endif() + +install(TARGETS modbusslave + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake new file mode 100644 index 0000000..3b4b7ac --- /dev/null +++ b/qt_cmdline.cmake @@ -0,0 +1 @@ +qt_commandline_subconfig(src/serialbus) diff --git a/qtserialbus.pro b/qtserialbus.pro deleted file mode 100644 index ebc35b3..0000000 --- a/qtserialbus.pro +++ /dev/null @@ -1,7 +0,0 @@ -requires(!wasm) - -lessThan(QT_MAJOR_VERSION, 5) { - message("Cannot build current QtSerialBus sources with Qt version $${QT_VERSION}.") -} - -load(qt_parts) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..4d0bf34 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(serialbus) +add_subdirectory(plugins) +add_subdirectory(tools) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt new file mode 100644 index 0000000..83a5822 --- /dev/null +++ b/src/plugins/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(canbus) diff --git a/src/plugins/canbus/CMakeLists.txt b/src/plugins/canbus/CMakeLists.txt new file mode 100644 index 0000000..c8a5144 --- /dev/null +++ b/src/plugins/canbus/CMakeLists.txt @@ -0,0 +1,15 @@ +add_subdirectory(virtualcan) +if(QT_FEATURE_socketcan) + add_subdirectory(socketcan) +endif() +if(QT_FEATURE_library) + add_subdirectory(passthrucan) + add_subdirectory(peakcan) + add_subdirectory(tinycan) +endif() +if(QT_FEATURE_library AND WIN32) + add_subdirectory(systeccan) +endif() +if(QT_FEATURE_library AND WIN32 AND NOT WINRT) + add_subdirectory(vectorcan) +endif() diff --git a/src/plugins/canbus/canbus.pro b/src/plugins/canbus/canbus.pro deleted file mode 100644 index ab9755c..0000000 --- a/src/plugins/canbus/canbus.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = subdirs - -include($$OUT_PWD/../../serialbus/qtserialbus-config.pri) -QT_FOR_CONFIG += serialbus-private - -SUBDIRS += virtualcan - -qtConfig(socketcan) { - SUBDIRS += socketcan -} - -qtConfig(library) { - SUBDIRS += passthrucan peakcan tinycan - win32 { - SUBDIRS += systeccan - !winrt:SUBDIRS += vectorcan - } -} diff --git a/src/plugins/canbus/passthrucan/CMakeLists.txt b/src/plugins/canbus/passthrucan/CMakeLists.txt new file mode 100644 index 0000000..f47a874 --- /dev/null +++ b/src/plugins/canbus/passthrucan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## PassThruCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(PassThruCanBusPlugin + OUTPUT_NAME qtpassthrucanbus + TYPE canbus + SOURCES + j2534passthru.cpp j2534passthru.h + main.cpp + passthrucanbackend.cpp passthrucanbackend.h + passthrucanio.cpp passthrucanio.h + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/src/plugins/canbus/passthrucan/passthrucan.pro b/src/plugins/canbus/passthrucan/passthrucan.pro deleted file mode 100644 index cb9bdc5..0000000 --- a/src/plugins/canbus/passthrucan/passthrucan.pro +++ /dev/null @@ -1,20 +0,0 @@ -QT = serialbus - -TARGET = qtpassthrucanbus - -SOURCES += \ - j2534passthru.cpp \ - main.cpp \ - passthrucanio.cpp \ - passthrucanbackend.cpp - -HEADERS += \ - j2534passthru.h \ - passthrucanio.h \ - passthrucanbackend.h - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = PassThruCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/peakcan/CMakeLists.txt b/src/plugins/canbus/peakcan/CMakeLists.txt new file mode 100644 index 0000000..ce0861d --- /dev/null +++ b/src/plugins/canbus/peakcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## PeakCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(PeakCanBusPlugin + OUTPUT_NAME qtpeakcanbus + TYPE canbus + SOURCES + main.cpp + peakcan_symbols_p.h + peakcanbackend.cpp peakcanbackend.h peakcanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/peakcan/peakcan.pro b/src/plugins/canbus/peakcan/peakcan.pro deleted file mode 100644 index d5b809c..0000000 --- a/src/plugins/canbus/peakcan/peakcan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtpeakcanbus - -QT = core serialbus - -HEADERS += \ - peakcanbackend.h \ - peakcanbackend_p.h \ - peakcan_symbols_p.h - -SOURCES += \ - main.cpp \ - peakcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = PeakCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/socketcan/CMakeLists.txt b/src/plugins/canbus/socketcan/CMakeLists.txt new file mode 100644 index 0000000..34872d2 --- /dev/null +++ b/src/plugins/canbus/socketcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## SocketCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(SocketCanBusPlugin + OUTPUT_NAME qtsocketcanbus + TYPE canbus + SOURCES + libsocketcan.cpp libsocketcan.h + main.cpp + socketcanbackend.cpp socketcanbackend.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/socketcan/socketcan.pro b/src/plugins/canbus/socketcan/socketcan.pro deleted file mode 100644 index cd731fd..0000000 --- a/src/plugins/canbus/socketcan/socketcan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtsocketcanbus - -QT = core serialbus - -HEADERS += \ - libsocketcan.h \ - socketcanbackend.h - -SOURCES += \ - libsocketcan.cpp \ - main.cpp \ - socketcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = SocketCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/systeccan/CMakeLists.txt b/src/plugins/canbus/systeccan/CMakeLists.txt new file mode 100644 index 0000000..4b11932 --- /dev/null +++ b/src/plugins/canbus/systeccan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## SystecCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(SystecCanBusPlugin + OUTPUT_NAME qtsysteccanbus + TYPE canbus + SOURCES + main.cpp + systeccan_symbols_p.h + systeccanbackend.cpp systeccanbackend.h systeccanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/systeccan/systeccan.pro b/src/plugins/canbus/systeccan/systeccan.pro deleted file mode 100644 index 3520325..0000000 --- a/src/plugins/canbus/systeccan/systeccan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtsysteccanbus - -QT = core serialbus - -HEADERS += \ - systeccanbackend.h \ - systeccanbackend_p.h \ - systeccan_symbols_p.h - -SOURCES += \ - main.cpp \ - systeccanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = SystecCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/tinycan/CMakeLists.txt b/src/plugins/canbus/tinycan/CMakeLists.txt new file mode 100644 index 0000000..dc2e306 --- /dev/null +++ b/src/plugins/canbus/tinycan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## TinyCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(TinyCanBusPlugin + OUTPUT_NAME qttinycanbus + TYPE canbus + SOURCES + main.cpp + tinycan_symbols_p.h + tinycanbackend.cpp tinycanbackend.h tinycanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/tinycan/tinycan.pro b/src/plugins/canbus/tinycan/tinycan.pro deleted file mode 100644 index c450bb9..0000000 --- a/src/plugins/canbus/tinycan/tinycan.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qttinycanbus - -QT = core serialbus - -HEADERS += \ - tinycanbackend.h \ - tinycanbackend_p.h \ - tinycan_symbols_p.h - -SOURCES += main.cpp \ - tinycanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = TinyCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/vectorcan/CMakeLists.txt b/src/plugins/canbus/vectorcan/CMakeLists.txt new file mode 100644 index 0000000..0c81c15 --- /dev/null +++ b/src/plugins/canbus/vectorcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## VectorCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(VectorCanBusPlugin + OUTPUT_NAME qtvectorcanbus + TYPE canbus + SOURCES + main.cpp + vectorcan_symbols_p.h + vectorcanbackend.cpp vectorcanbackend.h vectorcanbackend_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/src/plugins/canbus/vectorcan/vectorcan.pro b/src/plugins/canbus/vectorcan/vectorcan.pro deleted file mode 100644 index 847f2aa..0000000 --- a/src/plugins/canbus/vectorcan/vectorcan.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = qtvectorcanbus - -QT = core serialbus - -HEADERS += \ - vectorcanbackend.h \ - vectorcanbackend_p.h \ - vectorcan_symbols_p.h - -SOURCES += \ - main.cpp \ - vectorcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = VectorCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/canbus/virtualcan/CMakeLists.txt b/src/plugins/canbus/virtualcan/CMakeLists.txt new file mode 100644 index 0000000..a0b456c --- /dev/null +++ b/src/plugins/canbus/virtualcan/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## VirtualCanBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(VirtualCanBusPlugin + OUTPUT_NAME qtvirtualcanbus + TYPE canbus + SOURCES + main.cpp + virtualcanbackend.cpp virtualcanbackend.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Network + Qt::SerialBus +) diff --git a/src/plugins/canbus/virtualcan/virtualcan.pro b/src/plugins/canbus/virtualcan/virtualcan.pro deleted file mode 100644 index d719f70..0000000 --- a/src/plugins/canbus/virtualcan/virtualcan.pro +++ /dev/null @@ -1,16 +0,0 @@ -TARGET = qtvirtualcanbus - -QT = core network serialbus - -HEADERS += \ - virtualcanbackend.h - -SOURCES += \ - main.cpp \ - virtualcanbackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_CLASS_NAME = VirtualCanBusPlugin -load(qt_plugin) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index 456289e..0000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += canbus diff --git a/src/serialbus/CMakeLists.txt b/src/serialbus/CMakeLists.txt new file mode 100644 index 0000000..c88cd36 --- /dev/null +++ b/src/serialbus/CMakeLists.txt @@ -0,0 +1,55 @@ +##################################################################### +## SerialBus Module: +##################################################################### + +qt_internal_add_module(SerialBus + PLUGIN_TYPES canbus + SOURCES + qcanbus.cpp qcanbus.h + qcanbusdevice.cpp qcanbusdevice.h qcanbusdevice_p.h + qcanbusdeviceinfo.cpp qcanbusdeviceinfo.h qcanbusdeviceinfo_p.h + qcanbusfactory.cpp qcanbusfactory.h + qcanbusframe.cpp qcanbusframe.h + qmodbus_symbols_p.h + qmodbusadu_p.h + qmodbusclient.cpp qmodbusclient.h qmodbusclient_p.h + qmodbuscommevent_p.h + qmodbusdataunit.cpp qmodbusdataunit.h + qmodbusdevice.cpp qmodbusdevice.h qmodbusdevice_p.h + qmodbusdeviceidentification.cpp qmodbusdeviceidentification.h + qmodbuspdu.cpp qmodbuspdu.h + qmodbusreply.cpp qmodbusreply.h + qmodbusserver.cpp qmodbusserver.h qmodbusserver_p.h + qmodbustcpclient.cpp qmodbustcpclient.h qmodbustcpclient_p.h + qmodbustcpserver.cpp qmodbustcpserver.h qmodbustcpserver_p.h + qtserialbusglobal.h + LIBRARIES + Qt::CorePrivate + Qt::Network + PUBLIC_LIBRARIES + Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::Network +) + +## Scopes: +##################################################################### + +qt_internal_extend_target(SerialBus CONDITION QT_FEATURE_modbus_serialport + SOURCES + qmodbusrtuserialmaster.cpp + qmodbusrtuserialslave.cpp + PUBLIC_LIBRARIES + Qt::SerialPort + PRIVATE_MODULE_INTERFACE + Qt::SerialPort +) + +#### Keys ignored in scope 2:.:.:serialbus.pro:QT_FEATURE_modbus_serialport: +# PRIVATE_HEADERS = "qmodbusrtuserialmaster_p.h" "qmodbusrtuserialslave_p.h" +# PUBLIC_HEADERS = "qmodbusrtuserialmaster.h" "qmodbusrtuserialslave.h" +qt_internal_add_docs(SerialBus + doc/qtserialbus.qdocconf +) + diff --git a/src/serialbus/configure.cmake b/src/serialbus/configure.cmake new file mode 100644 index 0000000..55911b0 --- /dev/null +++ b/src/serialbus/configure.cmake @@ -0,0 +1,54 @@ + + +#### Inputs + + + +#### Libraries + + + +#### Tests + + +qt_config_compile_test("socketcan" + LABEL "Socket CAN" + PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/socketcan" +) + +qt_config_compile_test("socketcan_fd" + LABEL "Socket CAN FD" + PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/socketcan_fd" +) + + +#### Features + +qt_feature("socketcan" PRIVATE + LABEL "Socket CAN" + CONDITION LINUX AND TEST_socketcan +) +qt_feature("socketcan_fd" PRIVATE + LABEL "Socket CAN FD" + CONDITION LINUX AND QT_FEATURE_socketcan AND TEST_socketcan_fd +) +qt_feature("modbus-serialport" PUBLIC + LABEL "SerialPort Support" + PURPOSE "Enables Serial-based Modbus Support" + CONDITION TARGET Qt::SerialPort +) +qt_configure_add_summary_section(NAME "Qt SerialBus") +qt_configure_add_summary_entry(ARGS "socketcan") +qt_configure_add_summary_entry(ARGS "socketcan_fd") +qt_configure_add_summary_entry(ARGS "modbus-serialport") +qt_configure_end_summary_section() # end of "Qt SerialBus" section +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "QtSerialBus: Cannot find linux/can.h and linux/can/raw.h Linux headers for socketCAN support." + CONDITION LINUX AND NOT QT_FEATURE_socketcan +) +qt_configure_add_report_entry( + TYPE NOTE + MESSAGE "QtSerialBus: Newer kernel needed for flexible data-rate frame support (canfd_frame)." + CONDITION LINUX AND QT_FEATURE_socketcan AND NOT QT_FEATURE_socketcan_fd +) diff --git a/src/serialbus/doc/snippets/snippets.pro b/src/serialbus/doc/snippets/snippets.pro deleted file mode 100644 index 4fdcd74..0000000 --- a/src/serialbus/doc/snippets/snippets.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = app -TARGET = serialbus_cppsnippet -QT = core serialbus - -SOURCES += \ - snippetmain.cpp - diff --git a/src/serialbus/qt_cmdline.cmake b/src/serialbus/qt_cmdline.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/serialbus/qt_cmdline.cmake diff --git a/src/serialbus/serialbus.pro b/src/serialbus/serialbus.pro deleted file mode 100644 index 3abba31..0000000 --- a/src/serialbus/serialbus.pro +++ /dev/null @@ -1,74 +0,0 @@ -TARGET = QtSerialBus - -QT = core-private -QT_FOR_PRIVATE = network - -CONFIG += c++11 - -QMAKE_DOCS = $$PWD/doc/qtserialbus.qdocconf - -PUBLIC_HEADERS += \ - qcanbusdevice.h \ - qcanbusdeviceinfo.h \ - qcanbusfactory.h \ - qcanbusframe.h \ - qcanbus.h \ - qtserialbusglobal.h \ - qmodbusserver.h \ - qmodbusdevice.h \ - qmodbusdataunit.h \ - qmodbusclient.h \ - qmodbusreply.h \ - qmodbustcpclient.h \ - qmodbustcpserver.h \ - qmodbuspdu.h \ - qmodbusdeviceidentification.h - -PRIVATE_HEADERS += \ - qcanbusdevice_p.h \ - qcanbusdeviceinfo_p.h \ - qmodbusserver_p.h \ - qmodbusclient_p.h \ - qmodbusdevice_p.h \ - qmodbustcpclient_p.h \ - qmodbustcpserver_p.h \ - qmodbus_symbols_p.h \ - qmodbuscommevent_p.h \ - qmodbusadu_p.h \ - -SOURCES += \ - qcanbusdevice.cpp \ - qcanbusdeviceinfo.cpp \ - qcanbus.cpp \ - qcanbusfactory.cpp \ - qcanbusframe.cpp \ - qmodbusserver.cpp \ - qmodbusdevice.cpp \ - qmodbusdataunit.cpp \ - qmodbusclient.cpp \ - qmodbusreply.cpp \ - qmodbustcpclient.cpp \ - qmodbustcpserver.cpp \ - qmodbuspdu.cpp \ - qmodbusdeviceidentification.cpp - -qtConfig(modbus-serialport) { - QT_FOR_PRIVATE += serialport - - PUBLIC_HEADERS += \ - qmodbusrtuserialmaster.h \ - qmodbusrtuserialslave.h - - PRIVATE_HEADERS += \ - qmodbusrtuserialmaster_p.h \ - qmodbusrtuserialslave_p.h - - SOURCES += \ - qmodbusrtuserialmaster.cpp \ - qmodbusrtuserialslave.cpp -} -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - -MODULE_PLUGIN_TYPES = \ - canbus -load(qt_module) diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index c1543b3..0000000 --- a/src/src.pro +++ /dev/null @@ -1,23 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += serialbus -serialbus.subdir = serialbus -serialbus.target = sub-serialbus - -SUBDIRS += plugins -plugins.subdir = plugins -plugins.target = sub-plugins -plugins.depends = serialbus - -SUBDIRS += tools -tools.subdir = tools -tools.target = sub-tools -tools.depends = serialbus plugins - -!android:contains(QT_CONFIG, private_tests) { - SUBDIRS += serialbus_doc_snippets - serialbus_doc_snippets.subdir = serialbus/doc/snippets - - #plugin dependency required during static builds - serialbus_doc_snippets.depends = serialbus plugins -} diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt new file mode 100644 index 0000000..ace7502 --- /dev/null +++ b/src/tools/CMakeLists.txt @@ -0,0 +1,3 @@ +if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID)) + add_subdirectory(canbusutil) +endif() diff --git a/src/tools/canbusutil/CMakeLists.txt b/src/tools/canbusutil/CMakeLists.txt new file mode 100644 index 0000000..ce1d8b0 --- /dev/null +++ b/src/tools/canbusutil/CMakeLists.txt @@ -0,0 +1,16 @@ +##################################################################### +## canbusutil Tool: +##################################################################### + +qt_get_tool_target_name(target_name canbusutil) +qt_internal_add_tool(${target_name} + TARGET_DESCRIPTION "Qt CAN Bus Util" + TOOLS_TARGET SerialBus + SOURCES + canbusutil.cpp canbusutil.h + main.cpp + readtask.cpp readtask.h + sigtermhandler.cpp sigtermhandler.h + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/src/tools/canbusutil/canbusutil.pro b/src/tools/canbusutil/canbusutil.pro deleted file mode 100644 index b3e0504..0000000 --- a/src/tools/canbusutil/canbusutil.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = core serialbus - -SOURCES += main.cpp \ - readtask.cpp \ - canbusutil.cpp \ - sigtermhandler.cpp - -HEADERS += \ - readtask.h \ - canbusutil.h \ - sigtermhandler.h - -QMAKE_TARGET_DESCRIPTION = "Qt CAN Bus Util" -load(qt_tool) diff --git a/src/tools/tools.pro b/src/tools/tools.pro deleted file mode 100644 index 72d34fb..0000000 --- a/src/tools/tools.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -qtConfig(commandlineparser):!android|android_app: SUBDIRS += canbusutil diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..2e6270a --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,5 @@ +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. +endif() +qt_build_tests() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt new file mode 100644 index 0000000..9fb8825 --- /dev/null +++ b/tests/auto/CMakeLists.txt @@ -0,0 +1,19 @@ +add_subdirectory(cmake) +add_subdirectory(qcanbusframe) +add_subdirectory(qcanbusdevice) +add_subdirectory(qmodbusdataunit) +add_subdirectory(qmodbusreply) +add_subdirectory(qmodbusdevice) +add_subdirectory(qmodbuspdu) +add_subdirectory(qmodbusclient) +add_subdirectory(qmodbusserver) +add_subdirectory(qmodbuscommevent) +add_subdirectory(qmodbusadu) +add_subdirectory(qmodbusdeviceidentification) +add_subdirectory(plugins) +if(QT_FEATURE_modbus_serialport) + add_subdirectory(qmodbusrtuserialmaster) +endif() +if(NOT ANDROID) + add_subdirectory(qcanbus) +endif() diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index c9e958a..0000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,24 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += cmake \ - qcanbusframe \ - qcanbusdevice \ - qmodbusdataunit \ - qmodbusreply \ - qmodbusdevice \ - qmodbuspdu \ - qmodbusclient \ - qmodbusserver \ - qmodbuscommevent \ - qmodbusadu \ - qmodbusdeviceidentification - -QT_FOR_CONFIG += serialbus - -qtConfig(modbus-serialport): SUBDIRS += qmodbusrtuserialmaster - -!android: SUBDIRS += qcanbus - -qcanbus.depends += plugins -qcanbusdevice.depends += plugins - -SUBDIRS += plugins diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 1551299..e69de29 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,14 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(qmake_cmake_files) - -enable_testing() - -find_package(Qt5Core REQUIRED) - -include("${_Qt5CTestMacros}") - -test_module_includes( - SerialBus QCanBusFrame -) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro deleted file mode 100644 index d39b951..0000000 --- a/tests/auto/cmake/cmake.pro +++ /dev/null @@ -1,7 +0,0 @@ - -# Cause make to do nothing. -TEMPLATE = subdirs - -CMAKE_QT_MODULES_UNDER_TEST = serialbus - -CONFIG += ctest_testcase diff --git a/tests/auto/plugins/CMakeLists.txt b/tests/auto/plugins/CMakeLists.txt new file mode 100644 index 0000000..74f14c4 --- /dev/null +++ b/tests/auto/plugins/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(genericcanbus) +add_subdirectory(genericcanbusv1) diff --git a/tests/auto/plugins/genericcanbus/CMakeLists.txt b/tests/auto/plugins/genericcanbus/CMakeLists.txt new file mode 100644 index 0000000..298f99e --- /dev/null +++ b/tests/auto/plugins/genericcanbus/CMakeLists.txt @@ -0,0 +1,16 @@ +##################################################################### +## GenericBusPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(GenericBusPlugin + OUTPUT_NAME qtcanbustestgeneric + TYPE canbus + DEFAULT_IF FALSE + STATIC + SOURCES + dummybackend.cpp dummybackend.h + main.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/tests/auto/plugins/genericcanbus/genericcanbus.pro b/tests/auto/plugins/genericcanbus/genericcanbus.pro deleted file mode 100644 index f78c3d4..0000000 --- a/tests/auto/plugins/genericcanbus/genericcanbus.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qtcanbustestgeneric - -QT = core serialbus - -HEADERS += \ - dummybackend.h - -SOURCES += \ - main.cpp \ - dummybackend.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = - -PLUGIN_CLASS_NAME = GenericBusPlugin -load(qt_plugin) diff --git a/tests/auto/plugins/genericcanbusv1/CMakeLists.txt b/tests/auto/plugins/genericcanbusv1/CMakeLists.txt new file mode 100644 index 0000000..957c6e2 --- /dev/null +++ b/tests/auto/plugins/genericcanbusv1/CMakeLists.txt @@ -0,0 +1,16 @@ +##################################################################### +## GenericBusPluginV1 Plugin: +##################################################################### + +qt_internal_add_plugin(GenericBusPluginV1 + OUTPUT_NAME qtcanbustestgenericv1 + TYPE canbus + DEFAULT_IF FALSE + STATIC + SOURCES + dummybackendv1.cpp dummybackendv1.h + main.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::SerialBus +) diff --git a/tests/auto/plugins/genericcanbusv1/genericcanbusv1.pro b/tests/auto/plugins/genericcanbusv1/genericcanbusv1.pro deleted file mode 100644 index 57c4aa1..0000000 --- a/tests/auto/plugins/genericcanbusv1/genericcanbusv1.pro +++ /dev/null @@ -1,17 +0,0 @@ -TARGET = qtcanbustestgenericv1 - -QT = core serialbus - -HEADERS += \ - dummybackendv1.h - -SOURCES += \ - main.cpp \ - dummybackendv1.cpp - -DISTFILES = plugin.json - -PLUGIN_TYPE = canbus -PLUGIN_EXTENDS = - -PLUGIN_CLASS_NAME = GenericBusPluginV1 -load(qt_plugin) diff --git a/tests/auto/plugins/plugins.pro b/tests/auto/plugins/plugins.pro deleted file mode 100644 index f4f4623..0000000 --- a/tests/auto/plugins/plugins.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += genericcanbus genericcanbusv1 diff --git a/tests/auto/qcanbus/CMakeLists.txt b/tests/auto/qcanbus/CMakeLists.txt new file mode 100644 index 0000000..b95dd38 --- /dev/null +++ b/tests/auto/qcanbus/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## tst_qcanbus Test: +##################################################################### + +qt_internal_add_test(tst_qcanbus + SOURCES + tst_qcanbus.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) + +# should be +# qt6_import_plugins(tst_qcanbus INCLUDE GenericBusPlugin) +# but qt6_import_plugins does not work here +target_link_libraries(tst_qcanbus PRIVATE GenericBusPluginV1 GenericBusPlugin) diff --git a/tests/auto/qcanbus/qcanbus.pro b/tests/auto/qcanbus/qcanbus.pro deleted file mode 100644 index 342a4be..0000000 --- a/tests/auto/qcanbus/qcanbus.pro +++ /dev/null @@ -1,8 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qcanbus -CONFIG += testcase -CONFIG -= app_bundle - -QTPLUGIN += qtcanbustestgeneric - -SOURCES += tst_qcanbus.cpp diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp index 475adc4..670a9a5 100644 --- a/tests/auto/qcanbus/tst_qcanbus.cpp +++ b/tests/auto/qcanbus/tst_qcanbus.cpp @@ -38,6 +38,7 @@ #include <QtSerialBus/qcanbusfactory.h> #include <QtTest/qtest.h> +#include <QtCore/QtPlugin> class tst_QCanBus : public QObject { @@ -125,5 +126,7 @@ void tst_QCanBus::createDevice() } QTEST_MAIN(tst_QCanBus) +Q_IMPORT_PLUGIN(GenericBusPlugin) +Q_IMPORT_PLUGIN(GenericBusPluginV1) #include "tst_qcanbus.moc" diff --git a/tests/auto/qcanbusdevice/CMakeLists.txt b/tests/auto/qcanbusdevice/CMakeLists.txt new file mode 100644 index 0000000..ae902fc --- /dev/null +++ b/tests/auto/qcanbusdevice/CMakeLists.txt @@ -0,0 +1,15 @@ +##################################################################### +## tst_qcanbusdevice Test: +##################################################################### + +qt_internal_add_test(tst_qcanbusdevice + SOURCES + tst_qcanbusdevice.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) + +# should be +# qt6_import_plugins(tst_qcanbusdevice INCLUDE GenericBusPlugin) +# but qt6_import_plugins does not work here +target_link_libraries(tst_qcanbusdevice PRIVATE GenericBusPluginV1 GenericBusPlugin) diff --git a/tests/auto/qcanbusdevice/qcanbusdevice.pro b/tests/auto/qcanbusdevice/qcanbusdevice.pro deleted file mode 100644 index d379e0c..0000000 --- a/tests/auto/qcanbusdevice/qcanbusdevice.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qcanbusdevice -CONFIG += testcase - -QTPLUGIN += qtcanbustestgeneric - -SOURCES += tst_qcanbusdevice.cpp diff --git a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp index 8936531..24f5cbc 100644 --- a/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp +++ b/tests/auto/qcanbusdevice/tst_qcanbusdevice.cpp @@ -39,6 +39,7 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qtimer.h> +#include <QtCore/QtPlugin> #include <QtTest/qsignalspy.h> #include <QtTest/qtest.h> @@ -715,5 +716,7 @@ void tst_QCanBusDevice::tst_waitForFramesWritten() } QTEST_MAIN(tst_QCanBusDevice) +Q_IMPORT_PLUGIN(GenericBusPlugin) +Q_IMPORT_PLUGIN(GenericBusPluginV1) #include "tst_qcanbusdevice.moc" diff --git a/tests/auto/qcanbusframe/CMakeLists.txt b/tests/auto/qcanbusframe/CMakeLists.txt new file mode 100644 index 0000000..8ba6b7f --- /dev/null +++ b/tests/auto/qcanbusframe/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qcanbusframe Test: +##################################################################### + +qt_internal_add_test(tst_qcanbusframe + SOURCES + tst_qcanbusframe.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qcanbusframe/qcanbusframe.pro b/tests/auto/qcanbusframe/qcanbusframe.pro deleted file mode 100644 index 74505ff..0000000 --- a/tests/auto/qcanbusframe/qcanbusframe.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qcanbusframe -CONFIG += testcase - -SOURCES += tst_qcanbusframe.cpp diff --git a/tests/auto/qmodbusadu/CMakeLists.txt b/tests/auto/qmodbusadu/CMakeLists.txt new file mode 100644 index 0000000..b568588 --- /dev/null +++ b/tests/auto/qmodbusadu/CMakeLists.txt @@ -0,0 +1,11 @@ +##################################################################### +## tst_qmodbusadu Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusadu + SOURCES + tst_qmodbusadu.cpp + PUBLIC_LIBRARIES + Qt::SerialBus + Qt::SerialBusPrivate +) diff --git a/tests/auto/qmodbusadu/qmodbusadu.pro b/tests/auto/qmodbusadu/qmodbusadu.pro deleted file mode 100644 index e17e5ec..0000000 --- a/tests/auto/qmodbusadu/qmodbusadu.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib serialbus serialbus-private -TARGET = tst_qmodbusadu -CONFIG += testcase c++11 - -CONFIG -= app_bundle - -SOURCES += tst_qmodbusadu.cpp diff --git a/tests/auto/qmodbusclient/CMakeLists.txt b/tests/auto/qmodbusclient/CMakeLists.txt new file mode 100644 index 0000000..3f4222a --- /dev/null +++ b/tests/auto/qmodbusclient/CMakeLists.txt @@ -0,0 +1,17 @@ +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qmodbusclient Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusclient + SOURCES + tst_qmodbusclient.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::SerialBus + Qt::SerialBusPrivate +) + diff --git a/tests/auto/qmodbusclient/qmodbusclient.pro b/tests/auto/qmodbusclient/qmodbusclient.pro deleted file mode 100644 index 32546e6..0000000 --- a/tests/auto/qmodbusclient/qmodbusclient.pro +++ /dev/null @@ -1,9 +0,0 @@ -requires(contains(QT_CONFIG, private_tests)) - -QT = core testlib serialbus core-private serialbus-private -TARGET = tst_qmodbusclient -CONFIG += testcase c++11 - -CONFIG -= app_bundle - -SOURCES += tst_qmodbusclient.cpp diff --git a/tests/auto/qmodbuscommevent/CMakeLists.txt b/tests/auto/qmodbuscommevent/CMakeLists.txt new file mode 100644 index 0000000..42cb953 --- /dev/null +++ b/tests/auto/qmodbuscommevent/CMakeLists.txt @@ -0,0 +1,11 @@ +##################################################################### +## tst_qmodbuscommevent Test: +##################################################################### + +qt_internal_add_test(tst_qmodbuscommevent + SOURCES + tst_qmodbuscommevent.cpp + PUBLIC_LIBRARIES + Qt::SerialBus + Qt::SerialBusPrivate +) diff --git a/tests/auto/qmodbuscommevent/qmodbuscommevent.pro b/tests/auto/qmodbuscommevent/qmodbuscommevent.pro deleted file mode 100644 index ae79de1..0000000 --- a/tests/auto/qmodbuscommevent/qmodbuscommevent.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib serialbus serialbus-private -TARGET = tst_qmodbuscommevent -CONFIG += testcase c++11 - -CONFIG -= app_bundle - -SOURCES += tst_qmodbuscommevent.cpp diff --git a/tests/auto/qmodbusdataunit/CMakeLists.txt b/tests/auto/qmodbusdataunit/CMakeLists.txt new file mode 100644 index 0000000..4084af6 --- /dev/null +++ b/tests/auto/qmodbusdataunit/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qmodbusdataunit Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusdataunit + SOURCES + tst_qmodbusdataunit.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qmodbusdataunit/qmodbusdataunit.pro b/tests/auto/qmodbusdataunit/qmodbusdataunit.pro deleted file mode 100644 index 9204ddf..0000000 --- a/tests/auto/qmodbusdataunit/qmodbusdataunit.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qmodbusdataunit -CONFIG += testcase c++11 - -SOURCES += tst_qmodbusdataunit.cpp diff --git a/tests/auto/qmodbusdevice/CMakeLists.txt b/tests/auto/qmodbusdevice/CMakeLists.txt new file mode 100644 index 0000000..00049d0 --- /dev/null +++ b/tests/auto/qmodbusdevice/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qmodbusdevice Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusdevice + SOURCES + tst_qmodbusdevice.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qmodbusdevice/qmodbusdevice.pro b/tests/auto/qmodbusdevice/qmodbusdevice.pro deleted file mode 100644 index 80b8e15..0000000 --- a/tests/auto/qmodbusdevice/qmodbusdevice.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qmodbusdevice -CONFIG += testcase c++11 - -SOURCES += tst_qmodbusdevice.cpp diff --git a/tests/auto/qmodbusdeviceidentification/CMakeLists.txt b/tests/auto/qmodbusdeviceidentification/CMakeLists.txt new file mode 100644 index 0000000..f56b6e7 --- /dev/null +++ b/tests/auto/qmodbusdeviceidentification/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qmodbusdeviceidentification Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusdeviceidentification + SOURCES + tst_qmodbusdeviceidentification.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qmodbusdeviceidentification/qmodbusdeviceidentification.pro b/tests/auto/qmodbusdeviceidentification/qmodbusdeviceidentification.pro deleted file mode 100644 index 721b521..0000000 --- a/tests/auto/qmodbusdeviceidentification/qmodbusdeviceidentification.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qmodbusdeviceidentification -CONFIG += testcase c++11 - -CONFIG -= app_bundle - -SOURCES += tst_qmodbusdeviceidentification.cpp diff --git a/tests/auto/qmodbuspdu/CMakeLists.txt b/tests/auto/qmodbuspdu/CMakeLists.txt new file mode 100644 index 0000000..782eb20 --- /dev/null +++ b/tests/auto/qmodbuspdu/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qmodbuspdu Test: +##################################################################### + +qt_internal_add_test(tst_qmodbuspdu + SOURCES + tst_qmodbuspdu.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qmodbuspdu/qmodbuspdu.pro b/tests/auto/qmodbuspdu/qmodbuspdu.pro deleted file mode 100644 index 9b52c2e..0000000 --- a/tests/auto/qmodbuspdu/qmodbuspdu.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qmodbuspdu -CONFIG += testcase c++11 - -CONFIG -= app_bundle - -SOURCES += tst_qmodbuspdu.cpp diff --git a/tests/auto/qmodbusreply/CMakeLists.txt b/tests/auto/qmodbusreply/CMakeLists.txt new file mode 100644 index 0000000..34a5585 --- /dev/null +++ b/tests/auto/qmodbusreply/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qmodbusreply Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusreply + SOURCES + tst_qmodbusreply.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qmodbusreply/qmodbusreply.pro b/tests/auto/qmodbusreply/qmodbusreply.pro deleted file mode 100644 index 3f46083..0000000 --- a/tests/auto/qmodbusreply/qmodbusreply.pro +++ /dev/null @@ -1,5 +0,0 @@ -QT = core testlib serialbus -TARGET = tst_qmodbusreply -CONFIG += testcase c++11 - -SOURCES += tst_qmodbusreply.cpp diff --git a/tests/auto/qmodbusrtuserialmaster/CMakeLists.txt b/tests/auto/qmodbusrtuserialmaster/CMakeLists.txt new file mode 100644 index 0000000..20e75ae --- /dev/null +++ b/tests/auto/qmodbusrtuserialmaster/CMakeLists.txt @@ -0,0 +1,10 @@ +##################################################################### +## tst_qmodbusrtuserialmaster Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusrtuserialmaster + SOURCES + tst_qmodbusrtuserialmaster.cpp + PUBLIC_LIBRARIES + Qt::SerialBus +) diff --git a/tests/auto/qmodbusrtuserialmaster/qmodbusrtuserialmaster.pro b/tests/auto/qmodbusrtuserialmaster/qmodbusrtuserialmaster.pro deleted file mode 100644 index 3125a27..0000000 --- a/tests/auto/qmodbusrtuserialmaster/qmodbusrtuserialmaster.pro +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG -= app_bundle -CONFIG += testcase c++11 - -QT = core testlib serialbus - -TARGET = tst_qmodbusrtuserialmaster -SOURCES += tst_qmodbusrtuserialmaster.cpp - diff --git a/tests/auto/qmodbusserver/CMakeLists.txt b/tests/auto/qmodbusserver/CMakeLists.txt new file mode 100644 index 0000000..4217551 --- /dev/null +++ b/tests/auto/qmodbusserver/CMakeLists.txt @@ -0,0 +1,11 @@ +##################################################################### +## tst_qmodbusserver Test: +##################################################################### + +qt_internal_add_test(tst_qmodbusserver + SOURCES + tst_qmodbusserver.cpp + PUBLIC_LIBRARIES + Qt::Network + Qt::SerialBus +) diff --git a/tests/auto/qmodbusserver/qmodbusserver.pro b/tests/auto/qmodbusserver/qmodbusserver.pro deleted file mode 100644 index 1dd0bc8..0000000 --- a/tests/auto/qmodbusserver/qmodbusserver.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib serialbus network -TARGET = tst_qmodbusserver -CONFIG += testcase c++11 - -CONFIG -= app_bundle - -SOURCES += tst_qmodbusserver.cpp diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index f2f91d3..0000000 --- a/tests/tests.pro +++ /dev/null @@ -1,4 +0,0 @@ -requires(qtHaveModule(serialbus)) - -TEMPLATE = subdirs -SUBDIRS += auto |