commit 6fa973b3771ff9ff61d82ae3cbebad8442d30816
Author: Enrico Forestieri <for...@lyx.org>
Date: Sun Mar 21 17:15:08 2021 +0100
Fix Qt6 deprecation warning about QString::fromUcs4
---
src/support/qstring_helpers.cpp | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/support/qstring_helpers.cpp b/src/support/qstring_helpers.cpp
index d34e455..19cac06 100644
--- a/src/support/qstring_helpers.cpp
+++ b/src/support/qstring_helpers.cpp
@@ -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)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
