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.
2025-12-21 17:46:48 +00:00 · 2022-07-14 18:08:54 +02:00
parent 8f2e616e07
commit 664f81249c
65 changed files with 742 additions and 714 deletions
--- a/internal/frontend/bridge-gui/qml/Proton/Action.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Action.qml
@ -15,8 +15,8 @@
 // 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 QtQuick 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Templates as T

 T.Action {
    property bool loading
--- a/internal/frontend/bridge-gui/qml/Proton/ApplicationWindow.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/ApplicationWindow.qml
@ -15,12 +15,12 @@
 // 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.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQml
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T

 T.ApplicationWindow {
    id: root
@ -46,7 +46,7 @@ T.ApplicationWindow {
            return data(index(row, 0), Qt.DisplayRole)
        }

-        onRowsInserted: {
+        onRowsInserted: function(parent, first, last) {
            for (var i = first; i <= last; i++) {
                var obj = popups.get(i)
                obj.onShouldShowChanged.connect( root.processPopups )
@ -55,7 +55,7 @@ T.ApplicationWindow {
            processPopups()
        }

-        onRowsAboutToBeRemoved: {
+        onRowsAboutToBeRemoved: function (parent, first, last) {
            for (var i = first; i <= last; i++ ) {
                var obj = popups.get(i)
                obj.onShouldShowChanged.disconnect( root.processPopups )
@ -112,7 +112,7 @@ T.ApplicationWindow {
    Connections {
        target: root.popupVisible

-        onVisibleChanged: {
+        function onVisibleChanged() {
            if (root.popupVisible.visible) {
                return
            }
@ -124,11 +124,11 @@ T.ApplicationWindow {

    color: root.colorScheme.background_norm

-    overlay.modal: Rectangle {
+    Overlay.modal: Rectangle {
        color: root.colorScheme.backdrop_norm
    }

-    overlay.modeless: Rectangle {
+    Overlay.modeless: Rectangle {
        color: "transparent"
    }
 }
--- a/internal/frontend/bridge-gui/qml/Proton/Button.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Button.qml
@ -15,12 +15,11 @@
 // 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 QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Layouts 1.12
-
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.Layouts
 import "." as Proton

 T.Button {
@ -129,7 +128,7 @@ T.Button {
            sourceSize.height: control.icon.height

            color: control.icon.color
-            source: control.loading ? "../icons/Loader_16.svg" : control.icon.source
+            source: control.loading ? "/qml/icons/Loader_16.svg" : control.icon.source
            visible: control.loading || control.icon.source

            RotationAnimation {
@ -147,7 +146,7 @@ T.Button {
    background: Rectangle {
        implicitWidth: 36
        implicitHeight: 36
-        radius: Style.button_radius
+        radius: ProtonStyle.button_radius
        visible: true
        color: {
            if (!isIcon) {
--- a/internal/frontend/bridge-gui/qml/Proton/CheckBox.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/CheckBox.qml
@ -15,10 +15,10 @@
 // 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 QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T

 T.CheckBox {
    property ColorScheme colorScheme
@ -39,7 +39,7 @@ T.CheckBox {
    indicator: Rectangle {
        implicitWidth: 20
        implicitHeight: 20
-        radius: Style.checkbox_radius
+        radius: ProtonStyle.checkbox_radius

        x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2
        y: control.topPadding + (control.availableHeight - height) / 2
@ -90,7 +90,7 @@ T.CheckBox {
            sourceSize.width: parent.width - 4
            sourceSize.height: parent.height - 4
            color: "#FFFFFF"
-            source: "../icons/ic-check.svg"
+            source: "/qml/icons/ic-check.svg"
            visible: control.checkState === Qt.Checked
        }

@ -124,11 +124,11 @@ T.CheckBox {
            return control.colorScheme.text_norm
        }

-        font.family: Style.font_family
-        font.weight: Style.fontWeight_400
-        font.pixelSize: Style.body_font_size
-        lineHeight: Style.body_line_height
+        font.family: ProtonStyle.font_family
+        font.weight: ProtonStyle.fontWeight_400
+        font.pixelSize: ProtonStyle.body_font_size
+        lineHeight: ProtonStyle.body_line_height
        lineHeightMode: Text.FixedHeight
-        font.letterSpacing: Style.body_letter_spacing
+        font.letterSpacing: ProtonStyle.body_letter_spacing
    }
 }
--- a/internal/frontend/bridge-gui/qml/Proton/ColorScheme.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/ColorScheme.qml
@ -15,7 +15,7 @@
 // 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.13
+import QtQml

 QtObject {
    // should be a pointer to ColorScheme object
--- a/internal/frontend/bridge-gui/qml/Proton/ComboBox.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/ComboBox.qml
@ -15,11 +15,11 @@
 // 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 QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T

 T.ComboBox {
    id: root
@ -40,10 +40,10 @@ T.ComboBox {

    spacing: 8

-    font.family: Style.font_family
-    font.weight: Style.fontWeight_400
-    font.pixelSize: Style.body_font_size
-    font.letterSpacing: Style.body_letter_spacing
+    font.family: ProtonStyle.font_family
+    font.weight: ProtonStyle.fontWeight_400
+    font.pixelSize: ProtonStyle.body_font_size
+    font.letterSpacing: ProtonStyle.body_letter_spacing

    contentItem: T.TextField {
        padding: 5
@ -64,7 +64,7 @@ T.ComboBox {
        placeholderTextColor: root.enabled ? root.colorScheme.text_hint : root.colorScheme.text_disabled

        background: Rectangle {
-            radius: Style.context_item_radius
+            radius: ProtonStyle.context_item_radius
            visible: root.enabled && root.editable && !root.flat
            border.color: {
                if (root.activeFocus) {
@ -85,7 +85,7 @@ T.ComboBox {
    background: Rectangle {
        implicitWidth: 140
        implicitHeight: 36
-        radius: Style.context_item_radius
+        radius: ProtonStyle.context_item_radius
        color: {
            if (root.down) {
                return root.colorScheme.interaction_default_active
@ -110,7 +110,7 @@ T.ComboBox {
        x: root.mirrored ? 12 : root.width - width - 12
        y: root.topPadding + (root.availableHeight - height) / 2
        color: root.enabled ? root.colorScheme.text_norm : root.colorScheme.text_disabled
-        source: popup.visible ? "../icons/ic-chevron-up.svg" : "../icons/ic-chevron-down.svg"
+        source: popup.visible ? "/qml/icons/ic-chevron-up.svg" : "/qml/icons/ic-chevron-down.svg"

        sourceSize.width: 16
        sourceSize.height: 16
@ -142,7 +142,7 @@ T.ComboBox {
        palette.highlightedText: selected ? root.colorScheme.text_invert : root.colorScheme.text_norm

        background: PaddedRectangle {
-            radius: Style.context_item_radius
+            radius: ProtonStyle.context_item_radius
            color: {
                if (parent.down) {
                    return root.colorScheme.interaction_default_active
@ -187,7 +187,7 @@ T.ComboBox {

        background: Rectangle {
            color: root.colorScheme.background_norm
-            radius: Style.dialog_radius
+            radius: ProtonStyle.dialog_radius
            border.color: root.colorScheme.border_weak
            border.width: 1
        }
--- a/internal/frontend/bridge-gui/qml/Proton/Dialog.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Dialog.qml
@ -15,11 +15,11 @@
 // 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.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQml
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl

 T.Dialog {
    id: root
@ -65,7 +65,7 @@ T.Dialog {

    background: Rectangle {
        color: root.colorScheme.background_norm
-        radius: Style.dialog_radius
+        radius: ProtonStyle.dialog_radius
    }

    // TODO: Add DropShadow here
--- a/internal/frontend/bridge-gui/qml/Proton/Label.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Label.qml
@ -15,10 +15,10 @@
 // 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 QtQuick 2.13
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T

 import "." as Proton

@ -53,67 +53,67 @@ T.Label {
    linkColor: root.colorScheme.interaction_norm
    palette.link: linkColor

-    font.family: Style.font_family
+    font.family: ProtonStyle.font_family
    lineHeightMode: Text.FixedHeight

    font.weight: {
        switch (root.type) {
        case Proton.Label.LabelType.Heading:
-            return Style.fontWeight_700
+            return ProtonStyle.fontWeight_700
        case Proton.Label.LabelType.Title:
-            return Style.fontWeight_700
+            return ProtonStyle.fontWeight_700
        case Proton.Label.LabelType.Lead:
-            return Style.fontWeight_400
+            return ProtonStyle.fontWeight_400
        case Proton.Label.LabelType.Body:
-            return Style.fontWeight_400
+            return ProtonStyle.fontWeight_400
        case Proton.Label.LabelType.Body_semibold:
-            return Style.fontWeight_600
+            return ProtonStyle.fontWeight_600
        case Proton.Label.LabelType.Body_bold:
-            return Style.fontWeight_700
+            return ProtonStyle.fontWeight_700
        case Proton.Label.LabelType.Caption:
-            return Style.fontWeight_400
+            return ProtonStyle.fontWeight_400
        case Proton.Label.LabelType.Caption_semibold:
-            return Style.fontWeight_600
+            return ProtonStyle.fontWeight_600
        case Proton.Label.LabelType.Caption_bold:
-            return Style.fontWeight_700
+            return ProtonStyle.fontWeight_700
        }
    }

    font.pixelSize: {
        switch (root.type) {
        case Proton.Label.LabelType.Heading:
-            return Style.heading_font_size
+            return ProtonStyle.heading_font_size
        case Proton.Label.LabelType.Title:
-            return Style.title_font_size
+            return ProtonStyle.title_font_size
        case Proton.Label.LabelType.Lead:
-            return Style.lead_font_size
+            return ProtonStyle.lead_font_size
        case Proton.Label.LabelType.Body:
        case Proton.Label.LabelType.Body_semibold:
        case Proton.Label.LabelType.Body_bold:
-            return Style.body_font_size
+            return ProtonStyle.body_font_size
        case Proton.Label.LabelType.Caption:
        case Proton.Label.LabelType.Caption_semibold:
        case Proton.Label.LabelType.Caption_bold:
-            return Style.caption_font_size
+            return ProtonStyle.caption_font_size
        }
    }

    lineHeight: {
        switch (root.type) {
        case Proton.Label.LabelType.Heading:
-            return Style.heading_line_height
+            return ProtonStyle.heading_line_height
        case Proton.Label.LabelType.Title:
-            return Style.title_line_height
+            return ProtonStyle.title_line_height
        case Proton.Label.LabelType.Lead:
-            return Style.lead_line_height
+            return ProtonStyle.lead_line_height
        case Proton.Label.LabelType.Body:
        case Proton.Label.LabelType.Body_semibold:
        case Proton.Label.LabelType.Body_bold:
-            return Style.body_line_height
+            return ProtonStyle.body_line_height
        case Proton.Label.LabelType.Caption:
        case Proton.Label.LabelType.Caption_semibold:
        case Proton.Label.LabelType.Caption_bold:
-            return Style.caption_line_height
+            return ProtonStyle.caption_line_height
        }
    }

@ -126,11 +126,11 @@ T.Label {
        case Proton.Label.LabelType.Body:
        case Proton.Label.LabelType.Body_semibold:
        case Proton.Label.LabelType.Body_bold:
-            return Style.body_letter_spacing
+            return ProtonStyle.body_letter_spacing
        case Proton.Label.LabelType.Caption:
        case Proton.Label.LabelType.Caption_semibold:
        case Proton.Label.LabelType.Caption_bold:
-            return Style.caption_letter_spacing
+            return ProtonStyle.caption_letter_spacing
        }
    }

--- a/internal/frontend/bridge-gui/qml/Proton/Menu.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Menu.qml
@ -15,11 +15,11 @@
 // 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 QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Window 2.12
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.Window
 import "."

 T.Menu {
@ -67,6 +67,6 @@ T.Menu {
        color: colorScheme.background_norm
        border.width: 1
        border.color: colorScheme.border_weak
-        radius: Style.account_row_radius
+        radius: ProtonStyle.account_row_radius
    }
 }
--- a/internal/frontend/bridge-gui/qml/Proton/MenuItem.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/MenuItem.qml
@ -15,10 +15,10 @@
 // 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 QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
 import "."

 T.MenuItem {
@ -39,10 +39,10 @@ T.MenuItem {
    icon.height: 24
    icon.color: control.enabled ? control.colorScheme.text_norm : control.colorScheme.text_disabled

-    font.family: Style.font_family
-    font.weight: Style.fontWeight_400
-    font.pixelSize: Style.body_font_size
-    font.letterSpacing: Style.body_letter_spacing
+    font.family: ProtonStyle.font_family
+    font.weight: ProtonStyle.fontWeight_400
+    font.pixelSize: ProtonStyle.body_font_size
+    font.letterSpacing: ProtonStyle.body_letter_spacing

    contentItem: IconLabel {
        id: iconLabel
@ -66,7 +66,7 @@ T.MenuItem {
    background: Rectangle {
        implicitWidth: 164
        implicitHeight: 36
-        radius: Style.button_radius
+        radius: ProtonStyle.button_radius
        color: control.down ? control.colorScheme.interaction_default_active : control.highlighted ? control.colorScheme.interaction_default_hover : control.colorScheme.interaction_default
    }
 }
--- a/internal/frontend/bridge-gui/qml/Proton/Popup.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Popup.qml
@ -15,11 +15,11 @@
 // 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.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T

 T.Popup {
    id: root
--- a/internal/frontend/bridge-gui/qml/Proton/RadioButton.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/RadioButton.qml
@ -15,10 +15,10 @@
 // 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 QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T

 T.RadioButton {
    property ColorScheme colorScheme
@ -105,11 +105,11 @@ T.RadioButton {
            return control.colorScheme.text_norm
        }

-        font.family: Style.font_family
-        font.weight: Style.fontWeight_400
-        font.pixelSize: Style.body_font_size
-        lineHeight: Style.body_line_height
+        font.family: ProtonStyle.font_family
+        font.weight: ProtonStyle.fontWeight_400
+        font.pixelSize: ProtonStyle.body_font_size
+        lineHeight: ProtonStyle.body_line_height
        lineHeightMode: Text.FixedHeight
-        font.letterSpacing: Style.body_letter_spacing
+        font.letterSpacing: ProtonStyle.body_letter_spacing
    }
 }
--- a/internal/frontend/bridge-gui/qml/Proton/Style.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Style.qml
@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.

 pragma Singleton
-import QtQml 2.13
-import QtQuick 2.12
+import QtQml
+import QtQuick

 import "./"

@ -105,8 +105,8 @@ QtObject {
        backdrop_norm: Qt.rgba(12./255., 12./255., 20./255., 0.32)

        // Images
-        welcome_img: "icons/img-welcome.png"
-        logo_img: "icons/product_logos.svg"
+        welcome_img: "/qml/icons/img-welcome.png"
+        logo_img: "/qml/icons/product_logos.svg"
    }

    property ColorScheme lightProminentStyle: ColorScheme {
@ -180,8 +180,8 @@ QtObject {
        backdrop_norm: Qt.rgba(0,0,0, 0.32)

        // Images
-        welcome_img: "icons/img-welcome-dark.png"
-        logo_img:    "icons/product_logos_dark.svg"
+        welcome_img: "/qml/icons/img-welcome-dark.png"
+        logo_img:    "/qml/icons/product_logos_dark.svg"
    }

    property ColorScheme darkStyle: ColorScheme {
@ -255,8 +255,8 @@ QtObject {
        backdrop_norm: Qt.rgba(0,0,0,0.32)

        // Images
-        welcome_img: "icons/img-welcome-dark.png"
-        logo_img:    "icons/product_logos_dark.svg"
+        welcome_img: "/qml/icons/img-welcome-dark.png"
+        logo_img:    "/qml/icons/product_logos_dark.svg"
    }

    property ColorScheme darkProminentStyle: ColorScheme {
@ -330,8 +330,8 @@ QtObject {
        backdrop_norm: Qt.rgba(0,0,0,0.32)

        // Images
-        welcome_img: "icons/img-welcome-dark.png"
-        logo_img:    "icons/product_logos_dark.svg"
+        welcome_img: "/qml/icons/img-welcome-dark.png"
+        logo_img:    "/qml/icons/product_logos_dark.svg"
    }

    property ColorScheme currentStyle: lightStyle
@ -341,7 +341,7 @@ QtObject {
            case "windows":
            return "Segoe UI"
            case "osx":
-            return "SF Pro Display"
+            return ".AppleSystemUIFont" // should be SF Pro for the foreseeable future. Using "SF Pro Display" direcly here is not allowed by the font's license.
            case "linux":
            return "Ubuntu"
            default:
--- a/internal/frontend/bridge-gui/qml/Proton/Switch.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Switch.qml
@ -15,10 +15,10 @@
 // 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 QtQuick 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls
+import QtQuick.Controls.impl

 T.Switch {
    property ColorScheme colorScheme
@ -96,7 +96,7 @@ T.Switch {
                sourceSize.width: 16
                sourceSize.height: 16
                color: "#FFFFFF"
-                source: "../icons/ic-check.svg"
+                source: "/qml/icons/ic-check.svg"
                visible: control.checked
            }

@ -116,7 +116,7 @@ T.Switch {
            sourceSize.width: 18
            sourceSize.height: 18
            color: control.colorScheme.interaction_norm_hover
-            source: "../icons/Loader_16.svg"
+            source: "/qml/icons/Loader_16.svg"
            visible: control.loading

            RotationAnimation {
@ -140,11 +140,11 @@ T.Switch {

        color: control.enabled || control.loading ? control.colorScheme.text_norm : control.colorScheme.text_disabled

-        font.family: Style.font_family
-        font.weight: Style.fontWeight_400
-        font.pixelSize: Style.body_font_size
-        lineHeight: Style.body_line_height
+        font.family: ProtonStyle.font_family
+        font.weight: ProtonStyle.fontWeight_400
+        font.pixelSize: ProtonStyle.body_font_size
+        lineHeight: ProtonStyle.body_line_height
        lineHeightMode: Text.FixedHeight
-        font.letterSpacing: Style.body_letter_spacing
+        font.letterSpacing: ProtonStyle.body_letter_spacing
    }
 }
--- a/internal/frontend/bridge-gui/qml/Proton/TextArea.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/TextArea.qml
@ -15,12 +15,12 @@
 // 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.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Layouts 1.12
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.Layouts

 import "." as Proton

@ -198,10 +198,10 @@ FocusScope {
                leftPadding: 12
                rightPadding: 12

-                font.family: Style.font_family
-                font.weight: Style.fontWeight_400
-                font.pixelSize: Style.body_font_size
-                font.letterSpacing: Style.body_letter_spacing
+                font.family: ProtonStyle.font_family
+                font.weight: ProtonStyle.fontWeight_400
+                font.pixelSize: ProtonStyle.body_font_size
+                font.letterSpacing: ProtonStyle.body_letter_spacing

                color: control.enabled ? root.colorScheme.text_norm : root.colorScheme.text_disabled
                placeholderTextColor: control.enabled ? root.colorScheme.text_hint : root.colorScheme.text_disabled
@ -233,7 +233,7 @@ FocusScope {

                    Connections {
                        target: control
-                        onCursorPositionChanged: {
+                        function onCursorPositionChanged() {
                            // keep a moving cursor visible
                            cursor.opacity = 1
                            timer.restart()
@ -270,7 +270,7 @@ FocusScope {
                background: Rectangle {
                    anchors.fill: parent

-                    radius: Style.input_radius
+                    radius: ProtonStyle.input_radius
                    visible: true
                    color: root.colorScheme.background_norm
                    border.color: {
@ -308,7 +308,7 @@ FocusScope {
                Layout.rightMargin: 4

                visible: root.error && (assistiveText.text.length > 0)
-                source: "../icons/ic-exclamation-circle-filled.svg"
+                source: "/qml/icons/ic-exclamation-circle-filled.svg"
                color: root.colorScheme.signal_danger
                height: assistiveText.height
                sourceSize.height: assistiveText.height
--- a/internal/frontend/bridge-gui/qml/Proton/TextField.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/TextField.qml
@ -15,12 +15,12 @@
 // 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.12
-import QtQuick.Controls 2.12
-import QtQuick.Controls.impl 2.12
-import QtQuick.Templates 2.12 as T
-import QtQuick.Layouts 1.12
+import QtQml
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import QtQuick.Layouts

 import "." as Proton

@ -160,7 +160,7 @@ FocusScope {
            Layout.fillHeight: true
            Layout.fillWidth: true

-            radius: Style.input_radius
+            radius: ProtonStyle.input_radius
            visible: true
            color: root.colorScheme.background_norm
            border.color: {
@ -208,10 +208,10 @@ FocusScope {
                    leftPadding: 12
                    rightPadding: 12

-                    font.family: Style.font_family
-                    font.weight: Style.fontWeight_400
-                    font.pixelSize: Style.body_font_size
-                    font.letterSpacing: Style.body_letter_spacing
+                    font.family: ProtonStyle.font_family
+                    font.weight: ProtonStyle.fontWeight_400
+                    font.pixelSize: ProtonStyle.body_font_size
+                    font.letterSpacing: ProtonStyle.body_letter_spacing

                    color: control.enabled ? root.colorScheme.text_norm : root.colorScheme.text_disabled
                    placeholderTextColor: control.enabled ? root.colorScheme.text_hint : root.colorScheme.text_disabled
@ -243,7 +243,7 @@ FocusScope {

                        Connections {
                            target: control
-                            onCursorPositionChanged: {
+                            function onCursorPositionChanged() {
                                // keep a moving cursor visible
                                cursor.opacity = 1
                                timer.restart()
--- a/internal/frontend/bridge-gui/qml/Proton/Toggle.qml
+++ b/internal/frontend/bridge-gui/qml/Proton/Toggle.qml
@ -15,10 +15,10 @@
 // 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 QtQuick 2.13
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.13
-import QtQuick.Controls.impl 2.13
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Controls.impl

 Item {
    id: root
@ -72,7 +72,7 @@ Item {

            ColorImage {
                anchors.centerIn: parent
-                source: "../icons/ic-check.svg"
+                source: "/qml/icons/ic-check.svg"
                color: root.colorScheme.background_norm
                height: root.colorScheme.body_font_size
                sourceSize.height: root.colorScheme.body_font_size
@ -83,7 +83,7 @@ Item {
        ColorImage {
            id: loader
            anchors.centerIn: parent
-            source: "../icons/Loader_16.svg"
+            source: "/qml/icons/Loader_16.svg"
            color: root.colorScheme.text_norm
            height: root.colorScheme.body_font_size
            sourceSize.height: root.colorScheme.body_font_size
--- a/internal/frontend/bridge-gui/qml/Proton/qmldir
+++ b/internal/frontend/bridge-gui/qml/Proton/qmldir
@ -21,6 +21,7 @@ depends QtQuick.Controls 2.12
 singleton ProtonStyle 4.0 Style.qml
 ColorScheme 4.0 ColorScheme.qml

+Action 4.0 Action.qml
 ApplicationWindow 4.0 ApplicationWindow.qml
 Button 4.0 Button.qml
 CheckBox 4.0 CheckBox.qml