diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-16 21:20:54 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-02-16 21:20:54 +0800 |
| commit | 202362d9258335c695eb75f55f4be74a50a1af33 (patch) | |
| tree | 918c4390162d27df67fb2241a25084020686392b /cmd | |
| parent | 393267489cca8448e6c7e1bfe9965d7a1aab821a (diff) | |
| parent | 164de5e22be39ba2bdc58f84f72572252634e7e1 (diff) | |
| download | dexon-202362d9258335c695eb75f55f4be74a50a1af33.tar dexon-202362d9258335c695eb75f55f4be74a50a1af33.tar.gz dexon-202362d9258335c695eb75f55f4be74a50a1af33.tar.bz2 dexon-202362d9258335c695eb75f55f4be74a50a1af33.tar.lz dexon-202362d9258335c695eb75f55f4be74a50a1af33.tar.xz dexon-202362d9258335c695eb75f55f4be74a50a1af33.tar.zst dexon-202362d9258335c695eb75f55f4be74a50a1af33.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mist/assets/qml/views/browser.qml | 4 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/transaction.qml | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/wallet.qml | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cmd/mist/assets/qml/views/browser.qml b/cmd/mist/assets/qml/views/browser.qml index 4d72b9741..631ef5a16 100644 --- a/cmd/mist/assets/qml/views/browser.qml +++ b/cmd/mist/assets/qml/views/browser.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 1.0; import QtQuick.Controls.Styles 1.0 import QtQuick.Layouts 1.0; import QtWebEngine 1.0 -//import QtWebEngine.experimental 1.0 +import QtWebEngine.experimental 1.0 import QtQuick.Window 2.0; Rectangle { @@ -326,6 +326,8 @@ Rectangle { WebEngineView { objectName: "webView" id: webview + experimental.settings.javascriptCanAccessClipboard: true + experimental.settings.localContentCanAccessRemoteUrls: true anchors { left: parent.left right: parent.right diff --git a/cmd/mist/assets/qml/views/transaction.qml b/cmd/mist/assets/qml/views/transaction.qml index 6637346b5..df798a9c0 100644 --- a/cmd/mist/assets/qml/views/transaction.qml +++ b/cmd/mist/assets/qml/views/transaction.qml @@ -103,7 +103,7 @@ Rectangle { ComboBox { id: valueDenom - currentIndex: 6 + currentIndex: 5 model: denomModel } } diff --git a/cmd/mist/assets/qml/views/wallet.qml b/cmd/mist/assets/qml/views/wallet.qml index d1d38bb72..59dbae848 100644 --- a/cmd/mist/assets/qml/views/wallet.qml +++ b/cmd/mist/assets/qml/views/wallet.qml @@ -104,7 +104,7 @@ Rectangle { ComboBox { id: valueDenom - currentIndex: 6 + currentIndex: 5 model: denomModel } |