Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-17 23:56:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/frontend/bridge-gui/qml/tests/Buttons.qml
View File

@ -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.Window 2.13
import QtQuick.Layouts 1.12
import QtQuick.Controls 2.12
import QtQuick
import QtQuick.Window
import QtQuick.Layouts
import QtQuick.Controls
import "../Proton"
@ -32,7 +32,7 @@ RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
iconLoading: "../icons/Loader_16.svg"
iconLoading: "/qml/icons/Loader_16.svg"
}
// Secondary buttons
@ -42,7 +42,7 @@ RowLayout {
Layout.fillHeight: true
secondary: true
iconLoading: "../icons/Loader_16.svg"
iconLoading: "/qml/icons/Loader_16.svg"
}
// Secondary icons
@ -53,11 +53,11 @@ RowLayout {
secondary: true
textNormal: ""
iconNormal: "../icons/ic-cross-close.svg"
iconNormal: "/qml/icons/ic-cross-close.svg"
textDisabled: ""
iconDisabled: "../icons/ic-cross-close.svg"
iconDisabled: "/qml/icons/ic-cross-close.svg"
textLoading: ""
iconLoading: "../icons/Loader_16.svg"
iconLoading: "/qml/icons/Loader_16.svg"
}
// Icons
@ -67,10 +67,10 @@ RowLayout {
Layout.fillHeight: true
textNormal: ""
iconNormal: "../icons/ic-cross-close.svg"
iconNormal: "/qml/icons/ic-cross-close.svg"
textDisabled: ""
iconDisabled: "../icons/ic-cross-close.svg"
iconDisabled: "/qml/icons/ic-cross-close.svg"
textLoading: ""
iconLoading: "../icons/Loader_16.svg"
iconLoading: "/qml/icons/Loader_16.svg"
}
}