From e689b5c8c67c778c32c4d8c4bcff3ad5fab20b43 Mon Sep 17 00:00:00 2001
From: Adam Celarek <5292991+adam-ce@users.noreply.github.com>
Date: Fri, 12 Jun 2026 07:27:01 +0200
Subject: [PATCH 01/12] remove obsolete qt tiff feature flag

---
 misc/qt_lite.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/misc/qt_lite.txt b/misc/qt_lite.txt
index 7d75fd176..e0497b0ae 100644
--- a/misc/qt_lite.txt
+++ b/misc/qt_lite.txt
@@ -50,7 +50,6 @@
 -no-feature-imageformat_xbm
 -no-feature-sql-sqlite
 -no-feature-jpeg
--no-feature-tiff
 -no-feature-ico
 -no-feature-gif
 -no-feature-qml-jit

From b0a29d8a219652d547a9c5acb122a506ae8a2b63 Mon Sep 17 00:00:00 2001
From: Adam Celarek <5292991+adam-ce@users.noreply.github.com>
Date: Fri, 12 Jun 2026 07:30:29 +0200
Subject: [PATCH 02/12] update documented qt version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fab11962d..ad0ab309a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ After that it should be a normal cmake project. That is, you run cmake to genera
 We use Qt Creator (with mingw on Windows), which is the only tested setup atm and makes setup of Android and WebAssembly builds reasonably easy. If you have questions, please go to Discord.
 
 ## Dependencies
-* Qt 6.8.0, or greater
+* Qt 6.11.1, or greater
 * g++ 12+, clang or msvc
 * OpenGL
 * Qt Positioning and Charts modules

From 807fed26eb18c3bc02baa4b7af7ba1053625daf4 Mon Sep 17 00:00:00 2001
From: Adam Celarek <5292991+adam-ce@users.noreply.github.com>
Date: Fri, 12 Jun 2026 12:22:59 +0200
Subject: [PATCH 03/12] remove obsolete webp qt feature flag

---
 misc/qt_lite.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/misc/qt_lite.txt b/misc/qt_lite.txt
index e0497b0ae..9056f35ed 100644
--- a/misc/qt_lite.txt
+++ b/misc/qt_lite.txt
@@ -56,7 +56,6 @@
 -no-feature-quickcontrols2-fluentwinui3
 -no-feature-qml-profiler
 -no-feature-dom
--no-feature-webp
 -no-feature-dbus
 -no-feature-quickcontrols2-fluentwinui3
 -no-feature-stack_protector

From 4abfca0c55ec6a420ba494c80a216306e47859dc Mon Sep 17 00:00:00 2001
From: Adam Celarek <5292991+adam-ce@users.noreply.github.com>
Date: Fri, 12 Jun 2026 12:47:00 +0200
Subject: [PATCH 04/12] ignore qml language server files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 10388004f..9db9daf94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /doc
 /build/*
 /.qtcreator/CMakeLists.txt.user
+**/.qmlls.ini

From 92bc2cf03dfb24b79f590d21e0168e9011546497 Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 16:57:46 +0200
Subject: [PATCH 05/12] put android min sdk and target sdk versions into cmake

---
 CMakeLists.txt                   |  5 +++++
 app/CMakeLists.txt               | 27 ++++++++++++---------------
 cmake/alp_add_unittest.cmake     | 23 +++++++++++++----------
 cmake/alp_configure_target.cmake |  9 +++++++++
 plain_renderer/CMakeLists.txt    | 25 ++++++++++++++++---------
 5 files changed, 55 insertions(+), 34 deletions(-)
 create mode 100644 cmake/alp_configure_target.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ff0e6b33..d3dcef8b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,11 @@ option(ALP_ENABLE_AVLANCHE_WARNING_LAYER "Enables avalanche warning layer (requi
 option(ALP_ENABLE_LABELS "Enables label rendering" ON)
 
 set(ALP_EXTERN_DIR "extern" CACHE STRING "name of the directory to store external libraries, fonts etc..")
+set(ALP_ANDROID_MIN_SDK_VERSION 28 CACHE STRING "minimum Android API level")
+set(ALP_ANDROID_TARGET_SDK_VERSION 36 CACHE STRING "target Android API level")
+set(ALP_ANDROID_COMPILE_SDK_VERSION 36 CACHE STRING "compile Android API level")
+
+include(cmake/alp_configure_target.cmake)
 
 if(ALP_ENABLE_TRACK_OBJECT_LIFECYCLE)
     add_definitions(-DALP_ENABLE_TRACK_OBJECT_LIFECYCLE)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ff072bc3a..d75aa6eb3 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -129,6 +129,7 @@ set_target_properties(alpineapp PROPERTIES
     QT_ANDROID_VERSION_CODE "${ALP_VERSION_INTEGER}"
 )
 target_link_libraries(alpineapp PUBLIC gl_engine Qt::Quick Qt::QuickControls2)
+alp_configure_target(alpineapp)
 
 if (ALP_ENABLE_QML_HOT_RELOAD)
     message(WARNING "building alpine app with qml-hot-reload. It'll slow incremental building due to a fix for hotreload.")
@@ -178,11 +179,6 @@ else()
 endif()
 
 if (ANDROID)
-    set_target_properties(alpineapp PROPERTIES
-        QT_ANDROID_COMPILE_SDK_VERSION "36"
-        QT_ANDROID_TARGET_SDK_VERSION "35"
-    )
-
     add_android_openssl_libraries(alpineapp)
     find_package(Qt6 REQUIRED COMPONENTS Widgets) # for QFileDialogue (adding tracks)
     target_link_libraries(alpineapp PUBLIC Qt::Widgets)
@@ -195,17 +191,18 @@ endif()
 if (EMSCRIPTEN)
     target_link_options(alpineapp PUBLIC -sASYNCIFY)
 
-    set(ALP_INSTALL_FILES
-        "$<TARGET_FILE_DIR:alpineapp>/alpineapp.js"
-        "$<TARGET_FILE_DIR:alpineapp>/alpineapp.wasm"
-        "$<TARGET_FILE_DIR:alpineapp>/alpineapp.html"
-        "$<TARGET_FILE_DIR:alpineapp>/qtloader.js"
+    install(
+        FILES
+            "$<TARGET_FILE_DIR:alpineapp>/alpineapp.js"
+            "$<TARGET_FILE_DIR:alpineapp>/alpineapp.wasm"
+            "$<TARGET_FILE_DIR:alpineapp>/alpineapp.html"
+            "$<TARGET_FILE_DIR:alpineapp>/qtloader.js"
+        DESTINATION
+            ${ALP_WWW_INSTALL_DIR})
+    install(FILES "$<TARGET_FILE_DIR:alpineapp>/alpineapp.worker.js"
+        DESTINATION ${ALP_WWW_INSTALL_DIR}
+        OPTIONAL
     )
-
-    if (ALP_ENABLE_THREADING)
-        list(APPEND ALP_INSTALL_FILES "$<TARGET_FILE_DIR:alpineapp>/alpineapp.worker.js")
-    endif()
-    install(FILES ${ALP_INSTALL_FILES} DESTINATION ${ALP_WWW_INSTALL_DIR})
 else()
     find_package(Qt6 REQUIRED COMPONENTS Widgets)
     target_link_libraries(alpineapp PUBLIC Qt::Widgets)
diff --git a/cmake/alp_add_unittest.cmake b/cmake/alp_add_unittest.cmake
index 1cdcbfaa7..557f20965 100644
--- a/cmake/alp_add_unittest.cmake
+++ b/cmake/alp_add_unittest.cmake
@@ -37,21 +37,24 @@ function(alp_add_unittest name)
             FILES
             ${alpineapp_fonts_SOURCE_DIR}/Roboto/Roboto-Regular.ttf
         )
-        set(ALP_INSTALL_FILES
-            "$<TARGET_FILE_DIR:${name}>/${name}.js"
-            "$<TARGET_FILE_DIR:${name}>/${name}.wasm"
-            "$<TARGET_FILE_DIR:${name}>/${name}.html"
-            "$<TARGET_FILE_DIR:${name}>/qtloader.js"
+        install(
+            FILES
+                "$<TARGET_FILE_DIR:${name}>/${name}.js"
+                "$<TARGET_FILE_DIR:${name}>/${name}.wasm"
+                "$<TARGET_FILE_DIR:${name}>/${name}.html"
+                "$<TARGET_FILE_DIR:${name}>/qtloader.js"
+            DESTINATION
+                ${ALP_WWW_INSTALL_DIR})
+        install(
+            FILES "$<TARGET_FILE_DIR:${name}>/${name}.worker.js"
+            DESTINATION ${ALP_WWW_INSTALL_DIR}
+            OPTIONAL
         )
-
-        if (ALP_ENABLE_THREADING)
-            list(APPEND ALP_INSTALL_FILES "$<TARGET_FILE_DIR:${name}>/${name}.worker.js")
-        endif()
-        install(FILES ${ALP_INSTALL_FILES} DESTINATION ${ALP_WWW_INSTALL_DIR})
     elseif(ANDROID)
         add_qml_catch2_console_unittests(${name} ${ARGN})
     else()
         qt_add_executable(${name} ${ARGN} ${CMAKE_SOURCE_DIR}/unittests/main.cpp)
         target_link_libraries(${name} PUBLIC Catch2::Catch2)
     endif()
+    alp_configure_target(${name})
 endfunction()
diff --git a/cmake/alp_configure_target.cmake b/cmake/alp_configure_target.cmake
new file mode 100644
index 000000000..e6477af6d
--- /dev/null
+++ b/cmake/alp_configure_target.cmake
@@ -0,0 +1,9 @@
+function(alp_configure_target target_name)
+    if (ANDROID)
+        set_target_properties(${target_name} PROPERTIES
+            QT_ANDROID_MIN_SDK_VERSION "${ALP_ANDROID_MIN_SDK_VERSION}"
+            QT_ANDROID_TARGET_SDK_VERSION "${ALP_ANDROID_TARGET_SDK_VERSION}"
+            QT_ANDROID_COMPILE_SDK_VERSION "${ALP_ANDROID_COMPILE_SDK_VERSION}"
+        )
+    endif()
+endfunction()
diff --git a/plain_renderer/CMakeLists.txt b/plain_renderer/CMakeLists.txt
index d6c7acf42..8ef70f152 100644
--- a/plain_renderer/CMakeLists.txt
+++ b/plain_renderer/CMakeLists.txt
@@ -29,20 +29,27 @@ set_target_properties(plain_renderer PROPERTIES
 target_link_libraries(plain_renderer PUBLIC gl_engine)
 target_include_directories(plain_renderer PRIVATE .)
 
+alp_configure_target(plain_renderer)
 
 if (EMSCRIPTEN)
     message(NOTICE "ALP_WWW_INSTALL_DIR = ${ALP_WWW_INSTALL_DIR}")
     configure_file(../site/mascot.png mascot.png COPYONLY)
     set(ALP_INSTALL_FILES
-        "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.js"
-        "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.wasm"
-        "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.html"
-        "$<TARGET_FILE_DIR:plain_renderer>/qtloader.js"
-        "${CMAKE_SOURCE_DIR}/site/mascot.png"
     )
-    if (ALP_ENABLE_THREADING)
-        list(APPEND ALP_INSTALL_FILES "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.worker.js")
-    endif()
-    install(FILES ${ALP_INSTALL_FILES} DESTINATION ${ALP_WWW_INSTALL_DIR})
+    install(
+        FILES
+            "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.js"
+            "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.wasm"
+            "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.html"
+            "$<TARGET_FILE_DIR:plain_renderer>/qtloader.js"
+            "${CMAKE_SOURCE_DIR}/site/mascot.png"
+        DESTINATION
+            ${ALP_WWW_INSTALL_DIR}
+    )
+    install(
+        FILES "$<TARGET_FILE_DIR:plain_renderer>/plain_renderer.worker.js"
+        DESTINATION ${ALP_WWW_INSTALL_DIR}
+        OPTIONAL
+    )
 
 endif()

From 7787eba69681a6b15f9b7d5edc486dd351eba09f Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 17:41:18 +0200
Subject: [PATCH 06/12] fix position update for some browsers (ff mobile is
 asking for permission twice now, but that is upstream i think)

---
 app/GnssInformation.cpp | 37 +++++++++++++++++++++++++++++++++++--
 app/GnssInformation.h   |  1 +
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/GnssInformation.cpp b/app/GnssInformation.cpp
index 0492f3468..4e70438c9 100644
--- a/app/GnssInformation.cpp
+++ b/app/GnssInformation.cpp
@@ -75,6 +75,11 @@ QDateTime GnssInformation::timestamp() const
 void GnssInformation::position_updated(const QGeoPositionInfo& position)
 {
 #ifdef ALP_ENABLE_GNSS
+    if (!position.coordinate().isValid()) {
+        qDebug() << "GnssInformation: Ignoring invalid position update";
+        return;
+    }
+
     m_latitude = position.coordinate().latitude();
     m_longitude = position.coordinate().longitude();
     m_altitude = position.coordinate().altitude();
@@ -86,6 +91,21 @@ void GnssInformation::position_updated(const QGeoPositionInfo& position)
 #endif
 }
 
+void GnssInformation::start_position_updates()
+{
+#ifdef ALP_ENABLE_GNSS
+    if (!m_position_source)
+        return;
+
+    m_position_source->startUpdates();
+
+    int timeout_ms = m_position_source->minimumUpdateInterval();
+    if (timeout_ms < 10000)
+        timeout_ms = 10000;
+    m_position_source->requestUpdate(timeout_ms);
+#endif
+}
+
 bool GnssInformation::enabled() const
 {
     return m_enabled;
@@ -93,8 +113,20 @@ bool GnssInformation::enabled() const
 
 void GnssInformation::set_enabled(bool new_enabled)
 {
+    qDebug("GnssInformation::set_enabled(%b)", new_enabled);
     if (m_enabled == new_enabled)
         return;
+
+#ifdef ALP_ENABLE_GNSS
+    if (new_enabled && !m_position_source) {
+        qDebug("GnssInformation: Cannot enable without QGeoPositionInfoSource");
+        return;
+    }
+#else
+    if (new_enabled)
+        return;
+#endif
+
     m_enabled = new_enabled;
 #ifdef ALP_ENABLE_GNSS
     if (m_enabled) {
@@ -107,11 +139,12 @@ void GnssInformation::set_enabled(bool new_enabled)
             qApp->requestPermission(gnssPermission, this, [this](const QPermission& permission) {
                 qDebug() << "qApp->requestPermission" << permission;
                 if (permission.status() == Qt::PermissionStatus::Granted) {
-                    m_position_source->startUpdates();
+                    start_position_updates();
                 } else {
                     set_enabled(false);
                 }
             });
+            emit enabled_changed();
             return;
         case Qt::PermissionStatus::Denied:
             qDebug() << "Qt::PermissionStatus::Denied";
@@ -119,7 +152,7 @@ void GnssInformation::set_enabled(bool new_enabled)
             return;
         case Qt::PermissionStatus::Granted:
             qDebug() << "Qt::PermissionStatus::Granted";
-            m_position_source->startUpdates();
+            start_position_updates();
         }
     } else {
         m_position_source->stopUpdates();
diff --git a/app/GnssInformation.h b/app/GnssInformation.h
index c07b334b2..db7c6a01c 100644
--- a/app/GnssInformation.h
+++ b/app/GnssInformation.h
@@ -49,6 +49,7 @@ class GnssInformation : public QQuickItem {
 
 private:
     void position_updated(const QGeoPositionInfo& position);
+    void start_position_updates();
 
 private:
     double m_latitude = 0;

From 59ad24f3535f93b0217bdb1527e2975408c23e60 Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 20:56:42 +0200
Subject: [PATCH 07/12] Fix GNSS debug bool formatting

---
 app/GnssInformation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/GnssInformation.cpp b/app/GnssInformation.cpp
index 4e70438c9..caf65769e 100644
--- a/app/GnssInformation.cpp
+++ b/app/GnssInformation.cpp
@@ -113,7 +113,7 @@ bool GnssInformation::enabled() const
 
 void GnssInformation::set_enabled(bool new_enabled)
 {
-    qDebug("GnssInformation::set_enabled(%b)", new_enabled);
+    qDebug("GnssInformation::set_enabled(%s)", new_enabled ? "true" : "false");
     if (m_enabled == new_enabled)
         return;
 

From 6e531b69399a093a7011edb4d105c48e5e7dc70e Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 22:19:36 +0200
Subject: [PATCH 08/12] Fix wasm Qt CI build directory reuse

---
 .github/workflows/deploy.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 07e23ff92..b49cb6c20 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -255,6 +255,9 @@ jobs:
         $QT_SRC_CONFIGURE -qt-host-path $QT_ROOT_DIR -platform wasm-emscripten -init-submodules -submodules qtdeclarative,qtbase,qtpositioning -skip qtlanguageserver,qtquicktimeline,qtimageformats
         cd ${{github.workspace}}/qt_src/qtbase
         git apply ${{github.workspace}}/misc/qt_68_qtbase_remove_dejavu_fonts.patch
+        cd ${{ github.workspace }}
+        rm -rf qt_wasm_build
+        mkdir qt_wasm_build
 
 
     - name: Build Qt for Webassembly (custom version)

From 8954f9a266160dd51744f62329da77a0cf042889 Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 22:53:21 +0200
Subject: [PATCH 09/12] Fix wasm Qt lite deprecated API cutoff

---
 .github/workflows/deploy.yml | 2 +-
 misc/qt_lite.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b49cb6c20..90ee2fb87 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -243,7 +243,7 @@ jobs:
       uses: actions/cache@v5
       with:
         path: qt_wasm_lite
-        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning
+        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning_${{ hashFiles('misc/qt_lite.txt', 'misc/qt_68_qtbase_remove_dejavu_fonts.patch') }}
         
     - name: Download and patch Qt
       if: steps.qt-cache.outputs.cache-hit != 'true'
diff --git a/misc/qt_lite.txt b/misc/qt_lite.txt
index 9056f35ed..f1e821195 100644
--- a/misc/qt_lite.txt
+++ b/misc/qt_lite.txt
@@ -1,5 +1,5 @@
 -static -reduce-exports -gc-binaries 
--disable-deprecated-up-to 0x070000
+-disable-deprecated-up-to 0x060000
 -no-dbus
 -no-sql-sqlite
 -no-widgets

From cb36ee1f052da2aaa56e41277998ba412f808a41 Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 23:36:01 +0200
Subject: [PATCH 10/12] Keep wasm debug Qt cache stable

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 90ee2fb87..7fb868aa6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -243,7 +243,7 @@ jobs:
       uses: actions/cache@v5
       with:
         path: qt_wasm_lite
-        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning_${{ hashFiles('misc/qt_lite.txt', 'misc/qt_68_qtbase_remove_dejavu_fonts.patch') }}
+        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning${{ contains(matrix.config, 'debug') && '' || format('_{0}', hashFiles('misc/qt_lite.txt', 'misc/qt_68_qtbase_remove_dejavu_fonts.patch')) }}
         
     - name: Download and patch Qt
       if: steps.qt-cache.outputs.cache-hit != 'true'

From 924d87c33fc87ad988548da4760c0ecd7b5391ea Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sat, 13 Jun 2026 23:48:09 +0200
Subject: [PATCH 11/12] Split wasm Qt cache keys by config type

---
 .github/workflows/deploy.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 7fb868aa6..700a75685 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -239,14 +239,23 @@ jobs:
         echo "QT_LITE_CONFIG=$(pwd)/misc/qt_lite.txt" >> $GITHUB_ENV
       
     - name: Cache Qt WebAssembly build
-      id: qt-cache
+      id: qt-cache-lite
+      if: ${{ !contains(matrix.config, 'debug') }}
       uses: actions/cache@v5
       with:
         path: qt_wasm_lite
-        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning${{ contains(matrix.config, 'debug') && '' || format('_{0}', hashFiles('misc/qt_lite.txt', 'misc/qt_68_qtbase_remove_dejavu_fonts.patch')) }}
+        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning_${{ hashFiles('misc/qt_lite.txt', 'misc/qt_68_qtbase_remove_dejavu_fonts.patch') }}
+
+    - name: Cache Qt WebAssembly build
+      id: qt-cache-debug
+      if: ${{ contains(matrix.config, 'debug') }}
+      uses: actions/cache@v5
+      with:
+        path: qt_wasm_lite
+        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning
         
     - name: Download and patch Qt
-      if: steps.qt-cache.outputs.cache-hit != 'true'
+      if: steps.qt-cache-lite.outputs.cache-hit != 'true' && steps.qt-cache-debug.outputs.cache-hit != 'true'
       shell: bash
       run: |
         git clone --branch $QT_VERSION git://code.qt.io/qt/qt5.git qt_src
@@ -261,7 +270,7 @@ jobs:
 
 
     - name: Build Qt for Webassembly (custom version)
-      if: steps.qt-cache.outputs.cache-hit != 'true'
+      if: steps.qt-cache-lite.outputs.cache-hit != 'true' && steps.qt-cache-debug.outputs.cache-hit != 'true'
       shell: bash
       run: |
         cd qt_wasm_build
@@ -273,7 +282,7 @@ jobs:
         [ -d "$QT_WASM_ROOT_DIR" ] && [ "$(ls -A $QT_WASM_ROOT_DIR)" ] || exit 1
 
     - name: Debug output
-      if: steps.qt-cache.outputs.cache-hit != 'true'
+      if: steps.qt-cache-lite.outputs.cache-hit != 'true' && steps.qt-cache-debug.outputs.cache-hit != 'true'
       run: |
         emcc -v
         echo "cmake version:"

From 435c361882e90a44255adeac3b58924eba65ab7a Mon Sep 17 00:00:00 2001
From: codex <codex@gataki.cg.tuwien.ac.at>
Date: Sun, 14 Jun 2026 00:00:14 +0200
Subject: [PATCH 12/12] Simplify wasm Qt cache key logic

---
 .github/workflows/deploy.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 700a75685..90ee2fb87 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -239,23 +239,14 @@ jobs:
         echo "QT_LITE_CONFIG=$(pwd)/misc/qt_lite.txt" >> $GITHUB_ENV
       
     - name: Cache Qt WebAssembly build
-      id: qt-cache-lite
-      if: ${{ !contains(matrix.config, 'debug') }}
+      id: qt-cache
       uses: actions/cache@v5
       with:
         path: qt_wasm_lite
         key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning_${{ hashFiles('misc/qt_lite.txt', 'misc/qt_68_qtbase_remove_dejavu_fonts.patch') }}
-
-    - name: Cache Qt WebAssembly build
-      id: qt-cache-debug
-      if: ${{ contains(matrix.config, 'debug') }}
-      uses: actions/cache@v5
-      with:
-        path: qt_wasm_lite
-        key: ${{ matrix.config }}_qt-${{ env.QT_VERSION }}_emcc-${{ env.WEBASSEMBLY_VERSION }}_qtpositioning
         
     - name: Download and patch Qt
-      if: steps.qt-cache-lite.outputs.cache-hit != 'true' && steps.qt-cache-debug.outputs.cache-hit != 'true'
+      if: steps.qt-cache.outputs.cache-hit != 'true'
       shell: bash
       run: |
         git clone --branch $QT_VERSION git://code.qt.io/qt/qt5.git qt_src
@@ -270,7 +261,7 @@ jobs:
 
 
     - name: Build Qt for Webassembly (custom version)
-      if: steps.qt-cache-lite.outputs.cache-hit != 'true' && steps.qt-cache-debug.outputs.cache-hit != 'true'
+      if: steps.qt-cache.outputs.cache-hit != 'true'
       shell: bash
       run: |
         cd qt_wasm_build
@@ -282,7 +273,7 @@ jobs:
         [ -d "$QT_WASM_ROOT_DIR" ] && [ "$(ls -A $QT_WASM_ROOT_DIR)" ] || exit 1
 
     - name: Debug output
-      if: steps.qt-cache-lite.outputs.cache-hit != 'true' && steps.qt-cache-debug.outputs.cache-hit != 'true'
+      if: steps.qt-cache.outputs.cache-hit != 'true'
       run: |
         emcc -v
         echo "cmake version:"