GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937)

Browse source
This commit is contained in:
Byron Hambly 2023-05-11 11:35:30 +00:00
commit 2b8eef42dd
45 changed files with 348 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/qt/guiutil.cpp
View file

@ -666,12 +666,12 @@ void setClipboard(const QString& str)
fs::path qstringToBoostPath(const QString &path)
{
return fs::path(path.toStdString());
return fs::u8path(path.toStdString());
}
QString boostPathToQString(const fs::path &path)
{
return QString::fromStdString(path.string());
return QString::fromStdString(path.u8string());
}
QString NetworkToQString(Network net)