vcl/inc/qt5/Qt5Tools.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5614c4ef4cf2b4e2f45e52541340951f12dd4f21
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Sep 24 06:58:23 2021 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Sep 24 13:57:59 2021 +0200
qt5: Use QString::fromUtf16 with 'const char16_t *' param
'QString QString::fromUtf16(const char16_t *, qsizetype)'
was introduced in Qt 5.3.
The one taking a 'const ushort *' param is deprecated in Qt 6.
Change-Id: I0f2a8ecc5e3dd16aaee55a288c27c3c1d65f87ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122550
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx
index f9b73b30c7c7..0af3d0f5a998 100644
--- a/vcl/inc/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/Qt5Tools.hxx
@@ -47,7 +47,7 @@ inline OUString toOUString(const QString& s)
inline QString toQString(const OUString& s)
{
- return QString::fromUtf16(reinterpret_cast<ushort const*>(s.getStr()),
s.getLength());
+ return QString::fromUtf16(s.getStr(), s.getLength());
}
inline QRect toQRect(const tools::Rectangle& rRect)
