summaryrefslogtreecommitdiffstats
path: root/cui/uiconfig/ui/hyphenate.ui
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2024-05-30 14:29:05 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2024-05-31 14:29:01 +0200
commiteff8497fa2ab9c0e4889e1cf38fdeff1b2ec195a (patch)
tree68974b50c8f4acbc7be230938b4dd49b934a1651 /cui/uiconfig/ui/hyphenate.ui
parentkf: Drop "5" from KF 5 desktop backend file names (diff)
downloadcore-master.tar.gz
core-master.zip
kf5be: Make fromQStringToOUString work for Qt 6 HEADmaster
Sync `fromQStringToOUString` with the `toOUString` implementation in `vcl/inc/qt5/QtTools.hxx`, which makes it work with Qt 6 as well. Without this, building this with a planned upcoming change that introduces a KF 6 desktop backend would fail like this: In file included from /home/user/development/git/libreoffice/shell/source/backends/kf6be/kfaccess.cxx:10: /home/user/development/git/libreoffice/shell/source/backends/kf6be/../kf5be/kfaccess.cxx:53:60: error: non-constant-expression cannot be narrowed from type 'qsizetype' (aka 'long long') to 'sal_Int32' (aka 'int') in initializer list [-Wc++11-narrowing] 53 | return { reinterpret_cast<char16_t const*>(s.utf16()), s.size() }; | ^~~~~~~~ /home/user/development/git/libreoffice/shell/source/backends/kf6be/../kf5be/kfaccess.cxx:53:60: note: insert an explicit cast to silence this issue 53 | return { reinterpret_cast<char16_t const*>(s.utf16()), s.size() }; | ^~~~~~~~ | static_cast<sal_Int32>( ) Change-Id: Ic2b1ddcaa290379187db69b33e4a700c148650e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168275 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'cui/uiconfig/ui/hyphenate.ui')
0 files changed, 0 insertions, 0 deletions