aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-03-13 23:37:33 -0400
committerluigi1111 <luigi1111w@gmail.com>2018-03-13 23:37:33 -0400
commita8ba815fb37725620faedc4c05a694aba53bb75a (patch)
treeb03a7e384ed7091b21584ef8f3031ed0e894549a
parentf12d47386f5ce80fbd204dbe23e31fb659e66bfc (diff)
parent5d2d6adfaff80e83a35096df42aa759015b09ea1 (diff)
downloadmonzero-gui-a8ba815fb37725620faedc4c05a694aba53bb75a.tar.gz
monzero-gui-a8ba815fb37725620faedc4c05a694aba53bb75a.tar.xz
monzero-gui-a8ba815fb37725620faedc4c05a694aba53bb75a.zip
Merge pull request #1141
5d2d6ad UTF-8 support for filenames and paths under Windows
-rw-r--r--monero-wallet-gui.pro7
-rw-r--r--wizard/WizardMain.qml8
2 files changed, 7 insertions, 8 deletions
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index c0161569..da05be3c 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -221,6 +221,13 @@ win32 {
-lboost_regex-mt-s \
-lboost_chrono-mt-s \
-lboost_program_options-mt-s \
+ -lboost_locale-mt-s \
+ -licuio \
+ -licuin \
+ -licuuc \
+ -licudt \
+ -licutu \
+ -liconv \
-lssl \
-lcrypto \
-Wl,-Bdynamic \
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index 43e2d5e0..05a4099e 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -185,14 +185,6 @@ ColumnLayout {
return false;
}
- // Don't allow non ascii characters in path on windows platforms until supported by Wallet2
- if (isWindows) {
- if (!isAscii(path)) {
- walletErrorDialog.text = qsTr("Non-ASCII characters are not allowed in wallet path or account name") + translationManager.emptyString;
- walletErrorDialog.open();
- return false;
- }
- }
return true;
}