[PR #139] [MERGED] feature/qt6-libssh-support #1613

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

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/139
Author: @Nethius
Created: 12/9/2022
Status: ✅ Merged
Merged: 4/6/2023
Merged by: @pokamest

Base: dev ← Head: feature/qt6-libssh-support


📝 Commits (10+)

  • 0ec0cb1 feature: added libssh submodule
  • a87610c Use libssh for server setup script
  • 3742583 added zlib to submodules. Added build and link zlib, libssh in CMakeLists.txt
  • a8fc42a added copying OpenSSL libraries, for windows and macos, to the folder with binaries, because we have the wrong folder structure with the OpenSSL library
  • cb69298 Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
  • 4e96b5d added libz lib name for linux target
  • 2d3ac28 skip section with openssl copy for linux
  • b1db4e8 Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support
  • cfaba93 changeGed libz lib name for linux target
  • efcd291 Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support

📊 Changes

175 files changed (+1012 additions, -1503237 deletions)

View changed files

📝 .gitmodules (+9 -0)
➖ client/3rd/QtSsh/.gitignore (+0 -50)
➖ client/3rd/QtSsh/.qmake.conf (+0 -3)
➖ client/3rd/QtSsh/QtSsh.pro (+0 -1)
➖ client/3rd/QtSsh/README.md (+0 -46)
➖ client/3rd/QtSsh/examples/examples.pro (+0 -2)
➖ client/3rd/QtSsh/examples/gitlab/Qml.qrc (+0 -5)
➖ client/3rd/QtSsh/examples/gitlab/Qml/Main.qml (+0 -51)
➖ client/3rd/QtSsh/examples/gitlab/Src/Main.cpp (+0 -17)
➖ client/3rd/QtSsh/examples/gitlab/Src/Ssh.cpp (+0 -61)
➖ client/3rd/QtSsh/examples/gitlab/Src/Ssh.hpp (+0 -26)
➖ client/3rd/QtSsh/examples/gitlab/gitlab.pro (+0 -29)
➖ client/3rd/QtSsh/src/botan/android/arm64-v8a/botan_all.cpp (+0 -104294)
➖ client/3rd/QtSsh/src/botan/android/arm64-v8a/botan_all.h (+0 -41892)
➖ client/3rd/QtSsh/src/botan/android/armeabi-v7a/botan_all.cpp (+0 -104294)
➖ client/3rd/QtSsh/src/botan/android/armeabi-v7a/botan_all.h (+0 -41890)
➖ client/3rd/QtSsh/src/botan/android/x86/botan_all.cpp (+0 -107355)
➖ client/3rd/QtSsh/src/botan/android/x86/botan_all.h (+0 -42007)
➖ client/3rd/QtSsh/src/botan/android/x86_64/botan_all.cpp (+0 -107612)
➖ client/3rd/QtSsh/src/botan/android/x86_64/botan_all.h (+0 -42010)

...and 80 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/139 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 12/9/2022 **Status:** ✅ Merged **Merged:** 4/6/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/qt6-libssh-support` --- ### 📝 Commits (10+) - [`0ec0cb1`](https://github.com/amnezia-vpn/amnezia-client/commit/0ec0cb1b19a1521218d52cc420dce6dcdd6cf1e4) feature: added libssh submodule - [`a87610c`](https://github.com/amnezia-vpn/amnezia-client/commit/a87610c8560f57f777695d075b66bab7e4ac70ed) Use libssh for server setup script - [`3742583`](https://github.com/amnezia-vpn/amnezia-client/commit/3742583508d515e954356bbb9b5c6b767664e9de) added zlib to submodules. Added build and link zlib, libssh in CMakeLists.txt - [`a8fc42a`](https://github.com/amnezia-vpn/amnezia-client/commit/a8fc42a17ee86d26e6f9068e4cd2a545eb24c475) added copying OpenSSL libraries, for windows and macos, to the folder with binaries, because we have the wrong folder structure with the OpenSSL library - [`cb69298`](https://github.com/amnezia-vpn/amnezia-client/commit/cb692983859a1113046e0e80b798dcf7691e3b42) Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support - [`4e96b5d`](https://github.com/amnezia-vpn/amnezia-client/commit/4e96b5d4a6913ceede7558d2d1a38173ea7b47c3) added libz lib name for linux target - [`2d3ac28`](https://github.com/amnezia-vpn/amnezia-client/commit/2d3ac286ac9381b2103380e0b96c194177e1a5af) skip section with openssl copy for linux - [`b1db4e8`](https://github.com/amnezia-vpn/amnezia-client/commit/b1db4e8a7af6731a7526f1c3084720dffc26f05d) Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support - [`cfaba93`](https://github.com/amnezia-vpn/amnezia-client/commit/cfaba932e03be252ee7f94b488a593bbb945f3c5) changeGed libz lib name for linux target - [`efcd291`](https://github.com/amnezia-vpn/amnezia-client/commit/efcd291e65519f3115152bf144be777d637e76ad) Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support ### 📊 Changes **175 files changed** (+1012 additions, -1503237 deletions) <details> <summary>View changed files</summary> 📝 `.gitmodules` (+9 -0) ➖ `client/3rd/QtSsh/.gitignore` (+0 -50) ➖ `client/3rd/QtSsh/.qmake.conf` (+0 -3) ➖ `client/3rd/QtSsh/QtSsh.pro` (+0 -1) ➖ `client/3rd/QtSsh/README.md` (+0 -46) ➖ `client/3rd/QtSsh/examples/examples.pro` (+0 -2) ➖ `client/3rd/QtSsh/examples/gitlab/Qml.qrc` (+0 -5) ➖ `client/3rd/QtSsh/examples/gitlab/Qml/Main.qml` (+0 -51) ➖ `client/3rd/QtSsh/examples/gitlab/Src/Main.cpp` (+0 -17) ➖ `client/3rd/QtSsh/examples/gitlab/Src/Ssh.cpp` (+0 -61) ➖ `client/3rd/QtSsh/examples/gitlab/Src/Ssh.hpp` (+0 -26) ➖ `client/3rd/QtSsh/examples/gitlab/gitlab.pro` (+0 -29) ➖ `client/3rd/QtSsh/src/botan/android/arm64-v8a/botan_all.cpp` (+0 -104294) ➖ `client/3rd/QtSsh/src/botan/android/arm64-v8a/botan_all.h` (+0 -41892) ➖ `client/3rd/QtSsh/src/botan/android/armeabi-v7a/botan_all.cpp` (+0 -104294) ➖ `client/3rd/QtSsh/src/botan/android/armeabi-v7a/botan_all.h` (+0 -41890) ➖ `client/3rd/QtSsh/src/botan/android/x86/botan_all.cpp` (+0 -107355) ➖ `client/3rd/QtSsh/src/botan/android/x86/botan_all.h` (+0 -42007) ➖ `client/3rd/QtSsh/src/botan/android/x86_64/botan_all.cpp` (+0 -107612) ➖ `client/3rd/QtSsh/src/botan/android/x86_64/botan_all.h` (+0 -42010) _...and 80 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-13 20:45:58 +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#1613
No description provided.