[PR #111] [MERGED] qzxing removed, Qrcodegen added #1593

Closed
opened 2026-10-13 20:45:42 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/111
Author: @pokamest
Created: 9/9/2022
Status: ✅ Merged
Merged: 9/10/2022
Merged by: @pokamest

Base: dev ← Head: qrcodegen


📝 Commits (4)

📊 Changes

15 files changed (+1433 additions, -116 deletions)

View changed files

📝 .gitmodules (+0 -3)
📝 .travis.yml (+1 -0)
➕ client/3rd/qrcodegen/qrcodegen.cpp (+856 -0)
➕ client/3rd/qrcodegen/qrcodegen.hpp (+551 -0)
➕ client/3rd/qrcodegen/qrcodegen.pri (+5 -0)
➖ client/3rd/qzxing (+0 -1)
📝 client/amnezia_application.cpp (+0 -4)
📝 client/client.pro (+1 -6)
📝 client/main.cpp (+0 -8)
➖ client/platforms/android/native.cpp (+0 -54)
➖ client/platforms/android/native.h (+0 -20)
📝 client/ui/pages_logic/ShareConnectionLogic.cpp (+16 -17)
📝 client/ui/pages_logic/ShareConnectionLogic.h (+1 -2)
📝 client/ui/qml/Pages/PageNetworkSetting.qml (+1 -1)
📝 client/ui/qml/Pages/PageStart.qml (+1 -0)

📄 Description

qzxing removed, Qrcodegen added


🔄 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/111 **Author:** [@pokamest](https://github.com/pokamest) **Created:** 9/9/2022 **Status:** ✅ Merged **Merged:** 9/10/2022 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `qrcodegen` --- ### 📝 Commits (4) - [`7a6c1de`](https://github.com/amnezia-vpn/amnezia-client/commit/7a6c1de5d5c0fd21a18a2b242667e6be3bbd163f) QrCoreGen - [`e25cbe5`](https://github.com/amnezia-vpn/amnezia-client/commit/e25cbe54d960afe66931e1d088d244b44395a7e4) Merge branch 'dev' into qrcodegen - [`de89777`](https://github.com/amnezia-vpn/amnezia-client/commit/de8977723ae779bf417f0a726409a86978566165) Merge branch 'dev' into qrcodegen - [`c5ba89b`](https://github.com/amnezia-vpn/amnezia-client/commit/c5ba89b05425154af8b4943a098c825d587df9b9) Code cleanup ### 📊 Changes **15 files changed** (+1433 additions, -116 deletions) <details> <summary>View changed files</summary> 📝 `.gitmodules` (+0 -3) 📝 `.travis.yml` (+1 -0) ➕ `client/3rd/qrcodegen/qrcodegen.cpp` (+856 -0) ➕ `client/3rd/qrcodegen/qrcodegen.hpp` (+551 -0) ➕ `client/3rd/qrcodegen/qrcodegen.pri` (+5 -0) ➖ `client/3rd/qzxing` (+0 -1) 📝 `client/amnezia_application.cpp` (+0 -4) 📝 `client/client.pro` (+1 -6) 📝 `client/main.cpp` (+0 -8) ➖ `client/platforms/android/native.cpp` (+0 -54) ➖ `client/platforms/android/native.h` (+0 -20) 📝 `client/ui/pages_logic/ShareConnectionLogic.cpp` (+16 -17) 📝 `client/ui/pages_logic/ShareConnectionLogic.h` (+1 -2) 📝 `client/ui/qml/Pages/PageNetworkSetting.qml` (+1 -1) 📝 `client/ui/qml/Pages/PageStart.qml` (+1 -0) </details> ### 📄 Description qzxing removed, Qrcodegen added --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
bsakaguchi 2026-10-13 20:45:42 +00:00
Sign in to join this conversation.
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#1593
No description provided.