[PR #1973] [MERGED] fix: qt6 9 support #2614

New issue

Closed

opened 2026-10-14 21:03:29 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:03:29 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1973
Author: @vkamn
Created: 11/4/2025
Status: ✅ Merged
Merged: 11/4/2025
Merged by: @vkamn

Base: dev ← Head: fix/qt6-9-support

📝 Commits (5)

3a6d160 Fix qt 6.9 support
2e7e65c add support android sdk 36
80ed0ea feat: add support SafeMargins from Android
247e0ef Fix black screen
97a7e9d Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD

📊 Changes

61 files changed (+255 additions, -68 deletions)

View changed files

📝 .github/workflows/deploy.yml (+2 -2)
📝 client/android/AndroidManifest.xml (+1 -0)
📝 client/android/res/values/styles.xml (+3 -0)
📝 client/android/src/org/amnezia/vpn/AmneziaActivity.kt (+84 -4)
📝 client/android/src/org/amnezia/vpn/AppListProvider.kt (+4 -4)
📝 client/cmake/android.cmake (+3 -3)
📝 client/platforms/android/android_controller.cpp (+15 -0)
📝 client/platforms/android/android_controller.h (+3 -0)
📝 client/resources.qrc (+0 -1)
📝 client/ui/controllers/settingsController.cpp (+57 -0)
📝 client/ui/controllers/settingsController.h (+10 -0)
📝 client/ui/qml/Components/QuestionDrawer.qml (+1 -1)
📝 client/ui/qml/Controls2/PopupType.qml (+1 -1)
📝 client/ui/qml/Pages2/PageHome.qml (+1 -1)
📝 client/ui/qml/Pages2/PageProtocolAwgSettings.qml (+1 -1)
📝 client/ui/qml/Pages2/PageProtocolCloakSettings.qml (+1 -1)
📝 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml (+1 -1)
📝 client/ui/qml/Pages2/PageProtocolRaw.qml (+1 -1)
📝 client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml (+1 -1)
📝 client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml (+1 -1)

...and 41 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/1973 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 11/4/2025 **Status:** ✅ Merged **Merged:** 11/4/2025 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `fix/qt6-9-support` --- ### 📝 Commits (5) - [`3a6d160`](https://github.com/amnezia-vpn/amnezia-client/commit/3a6d160bce0c9eeb18ab465c6ecd264542d28f0f) Fix qt 6.9 support - [`2e7e65c`](https://github.com/amnezia-vpn/amnezia-client/commit/2e7e65c1e0a727bc03d1722b2b0e2464b776bba5) add support android sdk 36 - [`80ed0ea`](https://github.com/amnezia-vpn/amnezia-client/commit/80ed0eacd4f3bfb3b063bc39d607554574355a5b) feat: add support SafeMargins from Android - [`247e0ef`](https://github.com/amnezia-vpn/amnezia-client/commit/247e0ef085b210fcebe7719a44f4b6673a8d3bf1) Fix black screen - [`97a7e9d`](https://github.com/amnezia-vpn/amnezia-client/commit/97a7e9d74f4efb14f23c89b4149217efae4ef896) Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD ### 📊 Changes **61 files changed** (+255 additions, -68 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/deploy.yml` (+2 -2) 📝 `client/android/AndroidManifest.xml` (+1 -0) 📝 `client/android/res/values/styles.xml` (+3 -0) 📝 `client/android/src/org/amnezia/vpn/AmneziaActivity.kt` (+84 -4) 📝 `client/android/src/org/amnezia/vpn/AppListProvider.kt` (+4 -4) 📝 `client/cmake/android.cmake` (+3 -3) 📝 `client/platforms/android/android_controller.cpp` (+15 -0) 📝 `client/platforms/android/android_controller.h` (+3 -0) 📝 `client/resources.qrc` (+0 -1) 📝 `client/ui/controllers/settingsController.cpp` (+57 -0) 📝 `client/ui/controllers/settingsController.h` (+10 -0) 📝 `client/ui/qml/Components/QuestionDrawer.qml` (+1 -1) 📝 `client/ui/qml/Controls2/PopupType.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageHome.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageProtocolAwgSettings.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageProtocolCloakSettings.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageProtocolRaw.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml` (+1 -1) _...and 41 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-14 21:03:29 +00:00