[PR #152] [MERGED] Moving to Qt 6 and cmake on Android client #1618

New issue

Closed

opened 2026-10-13 20:46:01 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 20:46:01 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/152
Author: @kolobchanin
Created: 1/16/2023
Status: ✅ Merged
Merged: 1/19/2023
Merged by: @pokamest

Base: qt_migration ← Head: feature/android_qt6_moving

📝 Commits (10+)

d417fa5 OpenVPN bandwidth counter for Android
54dc363 iOS fix + Android connection status restoration fix
6c614a4 Moving to Qt6:
82165ea 1) Fixed theme
ad7fc93 Added missing files
ad4b3df [WIP] cmake build for android
a30e478 Fix of cmake build
7851047 multi-abi support
41a4dc2 GitHub Actions fix
3e276c4 GitHub Actions fix #2

📊 Changes

39 files changed (+1269 additions, -575 deletions)

View changed files

📝 .github/workflows/deploy.yml (+8 -6)
➕ .github/workflows/tag-deploy.yml (+142 -0)
📝 CMakeLists.txt (+4 -0)
📝 client/3rd/QtSsh/src/botan/botan.cmake (+6 -8)
📝 client/3rd/qtkeychain (+1 -1)
📝 client/CMakeLists.txt (+15 -10)
📝 client/android/AndroidManifest.xml (+51 -95)
📝 client/android/build.gradle (+10 -5)
📝 client/android/gradle/wrapper/gradle-wrapper.properties (+1 -1)
📝 client/android/res/values/libs.xml (+5 -6)
📝 client/android/src/org/amnezia/vpn/AuthHelper.java (+1 -1)
📝 client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt (+25 -0)
📝 client/android/src/org/amnezia/vpn/VPNService.kt (+50 -38)
📝 client/android/src/org/amnezia/vpn/VPNServiceBinder.kt (+28 -21)
📝 client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt (+2 -2)
📝 client/android/src/org/amnezia/vpn/qt/VPNActivity.kt (+167 -40)
📝 client/android/src/org/amnezia/vpn/qt/VPNApplication.java (+1 -1)
➕ client/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt (+27 -0)
📝 client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java (+1 -1)
📝 client/client.pro (+10 -12)

...and 19 more files

📄 Description

Support of Qt 6
Building of Android client with cmake

_{🔄 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/152 **Author:** [@kolobchanin](https://github.com/kolobchanin) **Created:** 1/16/2023 **Status:** ✅ Merged **Merged:** 1/19/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `qt_migration` ← **Head:** `feature/android_qt6_moving` --- ### 📝 Commits (10+) - [`d417fa5`](https://github.com/amnezia-vpn/amnezia-client/commit/d417fa58ab74e14483341efcfbeedca16dc96acd) OpenVPN bandwidth counter for Android - [`54dc363`](https://github.com/amnezia-vpn/amnezia-client/commit/54dc363231e41dacb4aa9d14d6c60cead5ef4fb3) iOS fix + Android connection status restoration fix - [`6c614a4`](https://github.com/amnezia-vpn/amnezia-client/commit/6c614a4b3cb73820be0ec4fd46409277a0de9315) Moving to Qt6: - [`82165ea`](https://github.com/amnezia-vpn/amnezia-client/commit/82165eaf37ce4c573a13e710f8ad09adc0b6989e) 1) Fixed theme - [`ad7fc93`](https://github.com/amnezia-vpn/amnezia-client/commit/ad7fc937a9619209ad8ece6cceef6facccbdb028) Added missing files - [`ad4b3df`](https://github.com/amnezia-vpn/amnezia-client/commit/ad4b3dfad11ffb9ae5e2196389409e514e1f6251) [WIP] cmake build for android - [`a30e478`](https://github.com/amnezia-vpn/amnezia-client/commit/a30e478cbd87c962d5cc5ed4fff8f5dae261bd10) Fix of cmake build - [`7851047`](https://github.com/amnezia-vpn/amnezia-client/commit/7851047421fbad7bdd929a1afcc4d05095a16a57) multi-abi support - [`41a4dc2`](https://github.com/amnezia-vpn/amnezia-client/commit/41a4dc2fa2d1ad190430eaf6940d8a5b6fc591a3) GitHub Actions fix - [`3e276c4`](https://github.com/amnezia-vpn/amnezia-client/commit/3e276c4111e75e1a3f8ae434c57afe4000b79723) GitHub Actions fix #2 ### 📊 Changes **39 files changed** (+1269 additions, -575 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/deploy.yml` (+8 -6) ➕ `.github/workflows/tag-deploy.yml` (+142 -0) 📝 `CMakeLists.txt` (+4 -0) 📝 `client/3rd/QtSsh/src/botan/botan.cmake` (+6 -8) 📝 `client/3rd/qtkeychain` (+1 -1) 📝 `client/CMakeLists.txt` (+15 -10) 📝 `client/android/AndroidManifest.xml` (+51 -95) 📝 `client/android/build.gradle` (+10 -5) 📝 `client/android/gradle/wrapper/gradle-wrapper.properties` (+1 -1) 📝 `client/android/res/values/libs.xml` (+5 -6) 📝 `client/android/src/org/amnezia/vpn/AuthHelper.java` (+1 -1) 📝 `client/android/src/org/amnezia/vpn/OpenVPNThreadv3.kt` (+25 -0) 📝 `client/android/src/org/amnezia/vpn/VPNService.kt` (+50 -38) 📝 `client/android/src/org/amnezia/vpn/VPNServiceBinder.kt` (+28 -21) 📝 `client/android/src/org/amnezia/vpn/qt/AmneziaApp.kt` (+2 -2) 📝 `client/android/src/org/amnezia/vpn/qt/VPNActivity.kt` (+167 -40) 📝 `client/android/src/org/amnezia/vpn/qt/VPNApplication.java` (+1 -1) ➕ `client/android/src/org/amnezia/vpn/qt/VPNClientBinder.kt` (+27 -0) 📝 `client/android/src/org/ftylitak/qzxing/QZXingLiveActivity.java` (+1 -1) 📝 `client/client.pro` (+10 -12) _...and 19 more files_ </details> ### 📄 Description * Support of Qt 6 * Building of Android client with cmake --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 20:46:01 +00:00

closed this issue
added the
pull-request
label

No labels

pull-request

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

amnezia-vpn/amnezia-client#1618

No description provided.

Rows
Columns