diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-03 14:36:34 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-03 14:36:34 -0400 |
| commit | 19c2208dc447ccb5ba9ff990cbdd6ecf6b96f23d (patch) | |
| tree | f20c54706b28b334d15adae4e0261aa2d5ea4857 | |
| parent | 82cf31010a1c8c626bce6f06af20094a0375d220 (diff) | |
| parent | 9074633751f5f9a8083192bda9311d9f1789544a (diff) | |
| download | monzero-gui-19c2208dc447ccb5ba9ff990cbdd6ecf6b96f23d.tar.gz monzero-gui-19c2208dc447ccb5ba9ff990cbdd6ecf6b96f23d.tar.xz monzero-gui-19c2208dc447ccb5ba9ff990cbdd6ecf6b96f23d.zip | |
Merge pull request #2019
9074633 device: Trezor support added (ph4r05)
| -rwxr-xr-x | get_libwallet_api.sh | 1 | ||||
| -rw-r--r-- | wizard/WizardCreateDevice1.qml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index d6b5f3c8..7ee7f81e 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -94,6 +94,7 @@ BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=ON" if [ "$BUILD_TREZOR" == false ]; then BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF" fi +BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR_UDP_RELEASE=ON ${BUILD_TREZOR_FLAGS}" STATIC=false ANDROID=false diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index 9e106c6a..9ad2ca33 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -47,7 +47,7 @@ Rectangle { ListModel { id: deviceNameModel ListElement { column1: qsTr("Ledger") ; column2: "Ledger"; } -// ListElement { column1: qsTr("Trezor") ; column2: "Trezor"; } + ListElement { column1: qsTr("Trezor") ; column2: "Trezor"; } } function update(){ |