[PR #102] [MERGED] migrated the codebase to Qt6 and fixed some compatibility issues #1586

New issue

Closed

opened 2026-10-13 20:45:38 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 20:45:38 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/102
Author: @omortie
Created: 8/29/2022
Status: ✅ Merged
Merged: 8/31/2022
Merged by: @pokamest

Base: qt_migration ← Head: qt_migration

📝 Commits (1)

8c20a67 migrated the codebase to Qt6 and fixed some compatibility issues

📊 Changes

140 files changed (+5924 additions, -214 deletions)

View changed files

📝 client/3rd/QtSsh/src/ssh/sshpacket.cpp (+1 -1)
📝 client/3rd/QtSsh/src/ssh/sshx11inforetriever.cpp (+1 -1)
📝 client/3rd/SortFilterProxyModel/CMakeLists.txt (+20 -8)
📝 client/3rd/SortFilterProxyModel/SortFilterProxyModel.pri (+6 -2)
➕ client/3rd/SortFilterProxyModel/SortFilterProxyModel.qbs (+65 -0)
➕ client/3rd/SortFilterProxyModel/docs/index.html (+65 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-allof-members.html (+19 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-allof.html (+67 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-anyof-members.html (+19 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-anyof.html (+86 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionfilter-members.html (+20 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionfilter.html (+78 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionrole-members.html (+19 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionrole.html (+73 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionsorter-members.html (+21 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionsorter.html (+101 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filter-members.html (+19 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filter.html (+65 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filtercontainer-members.html (+18 -0)
➕ client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filtercontainer.html (+61 -0)

...and 80 more files

📄 Description

used a Qt6 ported version of SortFilterProxyModel
used an updated Qt6 compatible version of QXZing
added a flag to windows linker to avoid WinMain problem of MSVCRTD
renamed utils.cpp to utilities.cpp for avoiding confusion with the same file name in SortFilterProxyModel

_{🔄 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/102 **Author:** [@omortie](https://github.com/omortie) **Created:** 8/29/2022 **Status:** ✅ Merged **Merged:** 8/31/2022 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `qt_migration` ← **Head:** `qt_migration` --- ### 📝 Commits (1) - [`8c20a67`](https://github.com/amnezia-vpn/amnezia-client/commit/8c20a67cfad34368efb995c45cf5e485fad5ae44) migrated the codebase to Qt6 and fixed some compatibility issues ### 📊 Changes **140 files changed** (+5924 additions, -214 deletions) <details> <summary>View changed files</summary> 📝 `client/3rd/QtSsh/src/ssh/sshpacket.cpp` (+1 -1) 📝 `client/3rd/QtSsh/src/ssh/sshx11inforetriever.cpp` (+1 -1) 📝 `client/3rd/SortFilterProxyModel/CMakeLists.txt` (+20 -8) 📝 `client/3rd/SortFilterProxyModel/SortFilterProxyModel.pri` (+6 -2) ➕ `client/3rd/SortFilterProxyModel/SortFilterProxyModel.qbs` (+65 -0) ➕ `client/3rd/SortFilterProxyModel/docs/index.html` (+65 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-allof-members.html` (+19 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-allof.html` (+67 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-anyof-members.html` (+19 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-anyof.html` (+86 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionfilter-members.html` (+20 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionfilter.html` (+78 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionrole-members.html` (+19 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionrole.html` (+73 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionsorter-members.html` (+21 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-expressionsorter.html` (+101 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filter-members.html` (+19 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filter.html` (+65 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filtercontainer-members.html` (+18 -0) ➕ `client/3rd/SortFilterProxyModel/docs/qml-sortfilterproxymodel-filtercontainer.html` (+61 -0) _...and 80 more files_ </details> ### 📄 Description * used a Qt6 ported version of SortFilterProxyModel * used an updated Qt6 compatible version of QXZing * added a flag to windows linker to avoid WinMain problem of MSVCRTD * renamed utils.cpp to utilities.cpp for avoiding confusion with the same file name in SortFilterProxyModel --- <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:38 +00:00