From 4a90ed82fb7a68d8446a79a8eea2182323ba0ce3 Mon Sep 17 00:00:00 2001 From: Zac Gaetano Date: Thu, 7 May 2026 02:39:30 +0000 Subject: [PATCH] Add Qt resource file for WildDragon logo images - app/assets/dragonmoonlight.qrc: registers wilddragon-icon.jpg and wilddragon-logo.jpg under the /app/assets prefix so they are accessible in QML as qrc:/app/assets/wilddragon-{icon,logo}.jpg - CMakeLists_vpn.cmake: call qt5_add_resources or qt_add_resources (depending on Qt major version) to compile the .qrc into the binary --- app/assets/dragonmoonlight.qrc | 16 ++++++++++++++++ app/vpn/CMakeLists_vpn.cmake | 23 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 app/assets/dragonmoonlight.qrc diff --git a/app/assets/dragonmoonlight.qrc b/app/assets/dragonmoonlight.qrc new file mode 100644 index 0000000..bdac909 --- /dev/null +++ b/app/assets/dragonmoonlight.qrc @@ -0,0 +1,16 @@ + + + + + wilddragon-icon.jpg + wilddragon-logo.jpg + + diff --git a/app/vpn/CMakeLists_vpn.cmake b/app/vpn/CMakeLists_vpn.cmake index 555d9f1..4c4d15b 100644 --- a/app/vpn/CMakeLists_vpn.cmake +++ b/app/vpn/CMakeLists_vpn.cmake @@ -112,3 +112,26 @@ elseif(WIN32) ) endif() endif() + +# ─── Qt resources: logo images ──────────────────────────────────────────────── +# Assets referenced in QML as qrc:/app/assets/wilddragon-{icon,logo}.jpg +# Both qt5_add_resources and qt_add_resources accept a .qrc file path directly. + +set(DRAGON_QRC_FILE "${CMAKE_SOURCE_DIR}/app/assets/dragonmoonlight.qrc") + +if(NOT QT_VERSION_MAJOR) + # Fallback if QT_VERSION_MAJOR isn't set yet — derive from Qt5/Qt6 find_package result + if(Qt6_FOUND) + set(QT_VERSION_MAJOR 6) + else() + set(QT_VERSION_MAJOR 5) + endif() +endif() + +if(QT_VERSION_MAJOR EQUAL 6) + qt_add_resources(DRAGON_QRC_OBJS "${DRAGON_QRC_FILE}") +else() + qt5_add_resources(DRAGON_QRC_OBJS "${DRAGON_QRC_FILE}") +endif() + +target_sources(moonlight-qt PRIVATE ${DRAGON_QRC_OBJS})