monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-09-29 03:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2019

Browse source 
9074633 device: Trezor support added (ph4r05)
This commit is contained in:
luigi1111 2019-04-03 14:36:34 -04:00
commit 19c2208dc4
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
get_libwallet_api.sh
View file

@ -94,6 +94,7 @@ BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=ON"
if [ "$BUILD_TREZOR" == false ]; then if [ "$BUILD_TREZOR" == false ]; then
BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF" BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF"
fi fi
BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR_UDP_RELEASE=ON ${BUILD_TREZOR_FLAGS}"
STATIC=false STATIC=false
ANDROID=false ANDROID=false

2
wizard/WizardCreateDevice1.qml
View file

@ -47,7 +47,7 @@ Rectangle {
ListModel { ListModel {
id: deviceNameModel id: deviceNameModel
ListElement { column1: qsTr("Ledger") ; column2: "Ledger"; } ListElement { column1: qsTr("Ledger") ; column2: "Ledger"; }
// ListElement { column1: qsTr("Trezor") ; column2: "Trezor"; } ListElement { column1: qsTr("Trezor") ; column2: "Trezor"; }
} }
function update(){ function update(){