Add CMake, Qt5 and Qt6 support

Author: diffstorm

.gitignore

@@ -53,4 +53,5 @@ compile_commands.json
 
 *_qmlcache.qrc
 
-build/**
+build/**
+build*/**

CMakeLists.txt

@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(qCommTest LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# Find Qt
+find_package(Qt6 COMPONENTS Core Gui Network SerialPort Widgets REQUIRED)
+find_package(Qt5 COMPONENTS Core Gui Network SerialPort Widgets)
+
+if(Qt6_FOUND)
+    set(QT_VERSION 6)
+    message(STATUS "Using Qt 6")
+    set(QT_LIBS Qt6::Core Qt6::Gui Qt6::Network Qt6::SerialPort Qt6::Widgets)
+else()
+    set(QT_VERSION 5)
+    message(STATUS "Using Qt 5")
+    set(QT_LIBS Qt5::Core Qt5::Gui Qt5::Network Qt5::SerialPort Qt5::Widgets)
+endif()
+
+# Add source files
+set(SOURCES
+    main.cpp
+    mainwindow.cpp
+    mainwindow.h
+    mainwindow.ui
+    serial_port.cpp
+    serial_port.h
+    tcp_server.cpp
+    tcp_server.h
+    qdarkstyle/style.qrc
+)
+
+# Add executable
+add_executable(qCommTest ${SOURCES})
+
+# Link against Qt libraries
+target_link_libraries(qCommTest PRIVATE ${QT_LIBS})
+
+# Add icon for Windows
+if(WIN32)
+    set_target_properties(qCommTest PROPERTIES WIN32_EXECUTABLE TRUE)
+    set(RC_ICONS qdarkstyle/rc/icon.ico)
+    set(RC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qCommTest.rc)
+    file(WRITE ${RC_FILE} "IDI_ICON1 ICON DISCARDABLE \"${CMAKE_CURRENT_SOURCE_DIR}/${RC_ICONS}\"")
+    target_sources(qCommTest PRIVATE ${RC_FILE})
+endif()
+
+# Install rules
+install(TARGETS qCommTest
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)

README.md

@@ -1,17 +1,86 @@
 # qCommTest
 
-[![License](https://img.shields.io/github/license/diffstorm/ViterbiTrellis)](https://github.com/diffstorm/ViterbiTrellis/blob/main/LICENSE)
-[![Language](https://img.shields.io/github/languages/top/diffstorm/ViterbiTrellis)](https://github.com/diffstorm/ViterbiTrellis)
+[![License](https://img.shields.io/github/license/diffstorm/qCommTest)](https://github.com/diffstorm/qCommTest/blob/main/LICENSE)
+[![Language](https://img.shields.io/github/languages/top/diffstorm/qCommTest)](https://github.com/diffstorm/qCommTest)
 
-Serial Communication Test Tool
-- Serial COM Port / RS232
-- TCP
+A simple tool for testing serial (RS232) and TCP communication.
+
+## Features
+
+-   **Serial Port Communication:** Test communication with devices connected to serial ports.
+-   **TCP Server:** Create a TCP server to test network communication.
+-   **Cross-Platform:** Build and run on Windows, macOS, and Linux.
+-   **Qt5 and Qt6 Support:** Compatible with both Qt5 and Qt6 versions.
 
 ## Usage
+
 ![Usage](usage.gif)
 
-## :snowman: Author
-Eray Öztürk ([@diffstorm](https://github.com/diffstorm))
+1.  **Configure and start the communication port:**
+    -   For serial communication, select the port, baud rate, and other settings.
+    -   For TCP communication, set the port and start the server.
+2.  **Run the test code on the device:** The device should send and receive data according to the test protocol.
+3.  **Observe the log section:** The log section will show the test results and any errors that occur.
+
+## Installation
+
+### Prerequisites
+
+-   **CMake:** A cross-platform build system generator.
+-   **Qt:** A cross-platform application framework. You can use either Qt5 or Qt6.
+-   **C++ Compiler:** A C++ compiler that is compatible with the Qt version you are using.
+
+### Windows
+
+1.  **Install Chocolatey:** If you don't have Chocolatey, install it by following the instructions on the [Chocolatey website](https://chocolatey.org/install).
+2.  **Install CMake, Qt, and a compiler:**
+    ```bash
+    choco install cmake qt-creator-ide qt6-base qt6-serialport
+    ```
+3.  **Build the project:**
+    ```bash
+    mkdir build
+    cd build
+    cmake ..
+    cmake --build .
+    ```
+
+### macOS
+
+1.  **Install Homebrew:** If you don't have Homebrew, install it by following the instructions on the [Homebrew website](https://brew.sh/).
+2.  **Install CMake and Qt:**
+    ```bash
+    brew install cmake qt5
+    ```
+    *Note: You can also use `qt6` instead of `qt5`.*
+3.  **Build the project:**
+    ```bash
+    mkdir build
+    cd build
+    cmake ..
+    cmake --build .
+    ```
+
+### Linux (Ubuntu)
+
+1.  **Install dependencies:**
+    ```bash
+    sudo apt-get update
+    sudo apt-get install build-essential cmake qtcreator qtbase5-dev qtserialport5-dev
+    ```
+    *Note: For Qt6, you can use `qt6-base-dev` and `qt6-serialport-dev`.*
+2.  **Build the project:**
+    ```bash
+    mkdir build
+    cd build
+    cmake ..
+    cmake --build .
+    ```
+
+## Author
+
+Eray Öztürk ([@diffstorm](https://github.com/diffstorm))
+
+## License
 
-## LICENSE
-This project is licensed under the [GPL-3 License](LICENSE) - see the LICENSE file for details.
+This project is licensed under the [GPL-3.0-only License](LICENSE).

mainwindow.cpp

@@ -46,14 +46,14 @@ void MainWindow::Form_Init()
     setWindowFlags(Qt::Widget | Qt::MSWindowsFixedSizeDialogHint | Qt::FramelessWindowHint);
     // Right click menu
     usageAction = new QAction(tr("U&sage"), this);
-    connect(usageAction, &QAction::triggered, this, &MainWindow::Usage, Qt::UniqueConnection);
+    connect(usageAction, &QAction::triggered, this, &MainWindow::Usage);
     addAction(usageAction);
     aboutAction = new QAction(tr("A&bout"), this);
-    connect(aboutAction, &QAction::triggered, this, &MainWindow::About, Qt::UniqueConnection);
+    connect(aboutAction, &QAction::triggered, this, &MainWindow::About);
     addAction(aboutAction);
     quitAction = new QAction(tr("E&xit"), this);
     quitAction->setShortcut(tr("Ctrl+Q"));
-    connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
+    connect(quitAction, &QAction::triggered, qApp, &QApplication::quit);
     addAction(quitAction);
     setContextMenuPolicy(Qt::ActionsContextMenu);
     ui->setupUi(this);
@@ -94,7 +94,11 @@ void MainWindow::mousePressEvent(QMouseEvent *event)
 {
     if(event->button() == Qt::LeftButton)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         m_dragPosition = event->globalPosition().toPoint() - frameGeometry().topLeft();
+#else
+        m_dragPosition = event->globalPos() - frameGeometry().topLeft();
+#endif
         event->accept();
     }
 }
@@ -103,7 +107,11 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event)
 {
     if(event->buttons() & Qt::LeftButton)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         move(event->globalPosition().toPoint() - m_dragPosition);
+#else
+        move(event->globalPos() - m_dragPosition);
+#endif
         event->accept();
     }
 }

qCommTest.pro

@@ -1,6 +1,14 @@
 # qCommTest - Serial Communication Test Tool
 QT += core gui network serialport widgets
 
+# Add support for Qt6
+QT_MAJOR_VERSION = $str_member($split(QT_VERSION, .), 0)
+
+if(equals(QT_MAJOR_VERSION, 6)) {
+    QT += serialport
+}
+
+
 TARGET = qCommTest
 TEMPLATE = app
 

tcp_server.cpp

@@ -327,11 +327,11 @@ void TcpServer::onTimeoutRX()
     }
 }
 
-void TcpServer::onSocketErrorOccured(QAbstractSocket::SocketError err)
+void TcpServer::onSocketErrorOccured(QAbstractSocket::SocketError socketError)
 {
-    switch(err)
+    switch(socketError)
     {
-        case QTcpSocket::RemoteHostClosedError:
+        case QAbstractSocket::RemoteHostClosedError:
         {
             qint64 diff = QDateTime::currentMSecsSinceEpoch() - m_dataSentAt;
 
@@ -342,12 +342,12 @@ void TcpServer::onSocketErrorOccured(QAbstractSocket::SocketError err)
         }
         break;
 
-        case QTcpSocket::ConnectionRefusedError:
+        case QAbstractSocket::ConnectionRefusedError:
             qDebug() << "TCP Connection refused";
             break;
 
         default:
-            qCritical() << "TCP socket error:" << err << "-" << m_socket->errorString();
+            qCritical() << "TCP socket error:" << socketError << "-" << m_socket->errorString();
             break;
     }
 }