GODT-1569: upgrade bridge from qt 5 to qt 6.

Fixed issues introduced by upgrading to Qt 5.15.
WIP: upgrade to Qt 6
WIP: QML fixes. [sklp-ci]
WIP: macOS font fix.
WIP: backend is a now a singleton.
WIP: remove version number of import.
WIP: fixed missing Action in qmldir.
WIP: fixed errors on program exit.
WIP: CMake detects host arch on mac if not specified.
This commit is contained in:
Xavier Michelon
2022-07-14 18:08:54 +02:00
committed by Jakub
parent 8f2e616e07
commit 664f81249c
65 changed files with 742 additions and 714 deletions

View File

@ -15,14 +15,14 @@
// You should have received a copy of the GNU General Public License
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
import QtQml 2.12
import QtQuick 2.13
import QtQuick.Window 2.13
import QtQuick.Layouts 1.12
import QtQuick.Controls 2.13
import QtQml
import QtQuick
import QtQuick.Window
import QtQuick.Layouts
import QtQuick.Controls
import Proton 4.0
import Notifications 1.0
import Proton
import Notifications
Window {
id: root
@ -35,7 +35,6 @@ Window {
property ColorScheme colorScheme: ProtonStyle.currentStyle
property var backend
property var notifications
signal showMainWindow()
@ -114,7 +113,6 @@ Window {
Layout.bottomMargin: 12
colorScheme: root.colorScheme
backend: root.backend
notifications: root.notifications
notificationWhitelist: Notifications.Group.Connection | Notifications.Group.Update | Notifications.Group.Configuration
@ -164,7 +162,7 @@ Window {
ListView {
id: accountListView
model: root.backend.users
model: Backend.users
anchors.fill: parent
anchors.topMargin: 8
@ -185,7 +183,7 @@ Window {
implicitHeight: children[0].implicitHeight
implicitWidth: children[0].implicitWidth
property var user: root.backend.users.get(index)
property var user: Backend.users.get(index)
RowLayout {
spacing: 0
@ -262,7 +260,7 @@ Window {
Button {
colorScheme: root.colorScheme
secondary: true
icon.source: "./icons/ic-three-dots-vertical.svg"
icon.source: "/qml/icons/ic-three-dots-vertical.svg"
borderless: true
checkable: true