anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt6 deprecation warning about QString::fromUcs4

Browse Source
This commit is contained in:
Enrico Forestieri 2021-03-21 17:15:08 +01:00
parent 4a5ae39e8b
commit 6fa973b377
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/support/qstring_helpers.cpp
View File

@ -47,13 +47,21 @@ QString toqstr(docstring const & ucs4)
// need to be superfast.
if (ucs4.empty())
return QString();
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
return QString::fromStdU32String(reinterpret_cast<std::u32string const &>(ucs4));
#else
return QString::fromUcs4((uint const *)ucs4.data(), ucs4.length());
#endif
}
QString toqstr(char_type ucs4)
{
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
return QString::fromStdU32String(std::u32string(ucs4, 1));
#else
union { char_type c; uint i; } u = { ucs4 };
return QString::fromUcs4(&u.i, 1);
#endif
}
docstring qstring_to_ucs4(QString const & qstr)