Add required Qt modules (Gui, Sql, Widgets, SerialPort, WebSockets) and fix Docker tag for Bullseye armv6

Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>

Author: Copilot

.github/workflows/qt5_6.yml

@@ -29,7 +29,7 @@ jobs:
       matrix:
         os: [
           { distribution: debian, codename: bullseye, description: Debian Bullseye (amd64),                       architecture: [ amd64, linux/amd64  ], platform: x11, qt_version: '6.8.2'  },
-          { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 1 & Zero 1),     architecture: [ armv6, linux/arm/v6 ], platform: rpi, qt_version: '6.8.2'  },
+          { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 1 & Zero 1),     architecture: [ armv6, linux/arm/v6 ], platform: rpi, qt_version: '5.15.2' }, # Qt5 for armv6 - Docker image bullseye-qt6 doesn't exist
           { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 2),              architecture: [ armv7, linux/arm/v7 ], platform: rpi, qt_version: '6.8.2'  },
           { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64  ], platform: rpi, qt_version: '6.8.2'  },
           { distribution: debian, codename: bookworm, description: Debian Bookworm (amd64),                       architecture: [ amd64, linux/amd64  ], platform: x11, qt_version: '6.8.2'  },

CMakeLists.txt

@@ -165,7 +165,7 @@ endif()
 set(QT_VERSION_TO_BUILD "6.8.2" CACHE STRING "Qt version to build")
 
 # Qt6 CMake configure options for static build
-# We build only qtbase with minimal features to get Qt::Core and Qt::Network
+# Building qtbase with required modules for Hyperion.NG: Core, Gui, Network, Sql, Widgets
 set(QT_CMAKE_ARGS
 	-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
 	-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}/qt6
@@ -174,10 +174,9 @@ set(QT_CMAKE_ARGS
 	-DBUILD_SHARED_LIBS:BOOL=OFF
 	-DQT_BUILD_EXAMPLES:BOOL=OFF
 	-DQT_BUILD_TESTS:BOOL=OFF
-	-DFEATURE_sql:BOOL=OFF
-	-DFEATURE_dbus:BOOL=OFF
-	-DFEATURE_gui:BOOL=OFF
-	-DFEATURE_widgets:BOOL=OFF
+	-DFEATURE_sql:BOOL=ON
+	-DFEATURE_gui:BOOL=ON
+	-DFEATURE_widgets:BOOL=ON
 	-DFEATURE_testlib:BOOL=OFF
 	-DFEATURE_openssl:BOOL=OFF
 	-DFEATURE_icu:BOOL=OFF
@@ -188,9 +187,9 @@ set(QT_CMAKE_ARGS
 	${APPLE_CONFIGURATION}
 )
 
-# Build Qt6 qtbase from source (minimal static build with Network support)
-ExternalProject_Add(qt6
-	PREFIX				${CMAKE_CURRENT_BINARY_DIR}/qt6
+# Build Qt6 qtbase from source (static build with Core, Gui, Network, Sql, Widgets)
+ExternalProject_Add(qt6-base
+	PREFIX				${CMAKE_CURRENT_BINARY_DIR}/qt6-base
 	GIT_REPOSITORY		https://code.qt.io/qt/qtbase.git
 	GIT_TAG				v${QT_VERSION_TO_BUILD}
 	GIT_SHALLOW			TRUE
@@ -202,6 +201,49 @@ ExternalProject_Add(qt6
 	INSTALL_COMMAND		cmake --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
 )
 
+# Build Qt6 SerialPort module (required by Hyperion.NG)
+ExternalProject_Add(qt6-serialport
+	DEPENDS				qt6-base
+	PREFIX				${CMAKE_CURRENT_BINARY_DIR}/qt6-serialport
+	GIT_REPOSITORY		https://code.qt.io/qt/qtserialport.git
+	GIT_TAG				v${QT_VERSION_TO_BUILD}
+	GIT_SHALLOW			TRUE
+	GIT_PROGRESS		TRUE
+	UPDATE_COMMAND		""
+	CMAKE_ARGS			-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+						-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}/qt6
+						-DCMAKE_PREFIX_PATH:PATH=${CMAKE_INSTALL_PREFIX}/qt6
+						-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+						-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+						-DBUILD_SHARED_LIBS:BOOL=OFF
+						${APPLE_CONFIGURATION}
+	BUILD_COMMAND		cmake --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE} --parallel
+	INSTALL_COMMAND		cmake --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
+)
+
+# Build Qt6 WebSockets module (required by Hyperion.NG)
+ExternalProject_Add(qt6-websockets
+	DEPENDS				qt6-base
+	PREFIX				${CMAKE_CURRENT_BINARY_DIR}/qt6-websockets
+	GIT_REPOSITORY		https://code.qt.io/qt/qtwebsockets.git
+	GIT_TAG				v${QT_VERSION_TO_BUILD}
+	GIT_SHALLOW			TRUE
+	GIT_PROGRESS		TRUE
+	UPDATE_COMMAND		""
+	CMAKE_ARGS			-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+						-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}/qt6
+						-DCMAKE_PREFIX_PATH:PATH=${CMAKE_INSTALL_PREFIX}/qt6
+						-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+						-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+						-DBUILD_SHARED_LIBS:BOOL=OFF
+						${APPLE_CONFIGURATION}
+	BUILD_COMMAND		cmake --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE} --parallel
+	INSTALL_COMMAND		cmake --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
+)
+
+# Convenience target to build all Qt6 modules
+add_custom_target(qt6 DEPENDS qt6-base qt6-serialport qt6-websockets)
+
 # Set Qt6_DIR to find the built Qt6
 set(Qt6_DIR "${CMAKE_INSTALL_PREFIX}/qt6/lib/cmake/Qt6" CACHE PATH "Qt6 CMake directory" FORCE)
 list(PREPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/qt6)

README.md

@@ -14,19 +14,23 @@ This ensures:
 ### Build Configuration
 
 - **Qt Version**: 6.8.2
-- **Build Type**: Static (minimal configuration)
-- **Components**: Qt Core and Qt Network only
-- **Disabled Features**: GUI, Widgets, SQL, DBus, OpenSSL, ICU
+- **Build Type**: Static
+- **Modules Built**:
+  - **qtbase**: Core, Gui, Network, Sql, Widgets
+  - **qtserialport**: SerialPort
+  - **qtwebsockets**: WebSockets
+- **Disabled Features**: DBus (optional), OpenSSL, ICU
 
 ### Build Time
 
 Building Qt6 from source is time-intensive:
-- **First build**: 30-120 minutes depending on hardware
+- **First build**: 45-180 minutes depending on hardware (increased due to additional modules)
 - **Cached builds**: Much faster due to GitHub Actions caching
 
 ### Platform Support
 
 Qt6 6.8.2 static builds are created for:
 - **Linux**: All Debian distributions (Bullseye, Bookworm, Trixie) and architectures (amd64, armv6, armv7, arm64)
+  - Note: Debian Bullseye armv6 uses Qt 5.15.2 due to Docker image availability
 - **macOS**: arm64 and x64 architectures
 - **Windows**: arm64 and x64 architectures