vcl/qt5/QtBuilder.cxx | 4 ++--
vcl/qt5/QtInstanceBuilder.cxx | 1 +
vcl/qt5/QtInstanceComboBox.cxx | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit f2bf5e608c2150a478d8612e4664ba9279a00853
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Apr 19 13:11:25 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 19 21:17:24 2025 +0200
tdf#130857 qt weld: Convert accelerator for menu entries
Convert potential "_" GTK accelerator text to "&" Qt one for the
menu entry text/label.
Otherwise, entries in the menu of the "Modify" menu button
in Math's "Format" -> "Fonts" dialog show text using
literal "_" when using the qt6 VCL plugin with
SAL_VCL_QT_USE_WELDED_WIDGETS=1 .
Change-Id: Ifeab698fa458a486d2b223dab588329a2f83ea77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184371
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 1f550ab2888f..564436dd307e 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -656,8 +656,8 @@ void QtBuilder::insertMenuObject(QMenu* pParent, QMenu*
pSubMenu, const OUString
assert(!pSubMenu && "Handling not implemented yet");
(void)pSubMenu;
- const OUString sLabel = extractLabel(rProps);
- QAction* pAction = pParent->addAction(toQString(sLabel));
+ const QString sLabel = convertAccelerator(extractLabel(rProps));
+ QAction* pAction = pParent->addAction(sLabel);
pAction->setObjectName(toQString(rID));
const OUString sActionName(extractActionName(rProps));
commit 3229e8b0a52f22a11c94cdc95cef90fd1aaeb718
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Apr 19 13:01:53 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 19 21:17:16 2025 +0200
tdf#130857 qt weld: Support Math's "Format" -> "Fonts" dialog
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
This dialog can be triggered in Math via the
"Format" -> "Fonts" menu entry.
Change-Id: I4350a92433444d95a328d2d459156ab639216ed5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184370
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index b31a735ad664..90a2e0a82f9e 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -105,6 +105,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
u"modules/smath/ui/alignmentdialog.ui"_ustr,
u"modules/smath/ui/fontdialog.ui"_ustr,
u"modules/smath/ui/fontsizedialog.ui"_ustr,
+ u"modules/smath/ui/fonttypedialog.ui"_ustr,
u"modules/smath/ui/savedefaultsdialog.ui"_ustr,
u"modules/smath/ui/smathsettings.ui"_ustr,
u"modules/smath/ui/spacingdialog.ui"_ustr,
commit adc5d928ac419dfcf15135a4a69319b938a0768b
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Apr 19 12:48:27 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Apr 19 21:17:09 2025 +0200
tdf#130857 qt weld: Signal on combobox text, not index change
So far QtInstanceComboBox was calling weld::ComboBox::signal_changed
to notify of a change of the selected entry when the
QComboBox::currentIndexChanged signal was emitted.
However, that signal is also emitted when the
same entry remains selected, but its index changes,
which happens when another entry is inserted before
the currently selected entry.
This would trigger an infinite recursion with the
SmFontPickListBox's SelectHdl that gets called by
weld::ComboBox::signal_changed and then removes and
reinserts an entry.
See below for a sample backtrace seen with upcoming change
Change-Id: I4350a92433444d95a328d2d459156ab639216ed5
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Sat Apr 19 12:48:18 2025 +0200
tdf#130857 qt weld: Support Math's "Format" -> "Fonts" dialog
but without this commit here for the following scenario:
* Start Math
* "Format" -> "Fonts"
* click the "Modify" button, select "Math"
* select any font in the EntryTreeView
* confirm using the "OK" button
To avoid such problems, don't use a changed index,
but a text change as the criterion for a change of
the selected entry, i.e. connect to the
QComboBox::currentTextChanged signal instead of the
QComboBox::currentIndexChanged one.
(The assumption is that different entries also use a
unique text. While that is not technically required,
it should always be the case, as it's also needed for
the user to be able to distinguish between them.)
Backtrace:
[...]
#69195 0x00007f48aaecc45a in SmFontPickListBox::SelectHdl
(this=0x55cacbb3fdb0) at
/home/michi/development/git/libreoffice/starmath/source/utility.cxx:142
#69196 0x00007f48aaecc37d in SmFontPickListBox::LinkStubSelectHdl
(instance=0x55cacbb3fdb0, data=...) at
/home/michi/development/git/libreoffice/starmath/source/utility.cxx:134
#69197 0x00007f48cfa3f9e1 in Link<weld::ComboBox&, void>::Call
(this=0x55cacc0bc150, data=...) at include/tools/link.hxx:105
#69198 0x00007f48cfa3f5ec in weld::ComboBox::signal_changed
(this=0x55cacc0bc108) at include/vcl/weld.hxx:766
#69199 0x00007f48cfa3588d in QtInstanceComboBox::signalChanged
(this=0x55cacc0bbf90) at vcl/qt6/../qt5/QtInstanceComboBox.cxx:382
#69200 0x00007f48cfa3fe01 in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)::{lambda()#1}::operator()() const
(this=0x7ffde4d63c90) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:127
#69201 0x00007f48cfa3fd39 in
QtPrivate::FunctorCallBase::call_internal<void,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)::{lambda()#1}>(void**,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)::{lambda()#1}&&) (args=0x7ffde4d64050, fn=...) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:65
#69202 0x00007f48cfa3fc6b in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)
(f=(void (QtInstanceComboBox::*)(QtInstanceComboBox * const))
0x7f48cfa35850 <QtInstanceComboBox::signalChanged()>, o=0x55cacc0bbf90,
arg=0x7ffde4d64050)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:126
#69203 0x00007f48cfa3fbed in QtPrivate::FunctionPointer<void
(QtInstanceComboBox::*)()>::call<QtPrivate::List<>, void>(void
(QtInstanceComboBox::*)(), QtInstanceComboBox*, void**)
(f=(void (QtInstanceComboBox::*)(QtInstanceComboBox * const))
0x7f48cfa35850 <QtInstanceComboBox::signalChanged()>, o=0x55cacc0bbf90,
arg=0x7ffde4d64050)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:174
#69204 0x00007f48cfa3fb16 in QtPrivate::QCallableObject<void
(QtInstanceComboBox::*)(), QtPrivate::List<>, void>::impl(int,
QtPrivate::QSlotObjectBase*, QObject*, void**, bool*)
(which=1, this_=0x55cacc0bc300, r=0x55cacc0bbf90, a=0x7ffde4d64050,
ret=0x0) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:545
#69205 0x00007f48ce9061a2 in QtPrivate::QSlotObjectBase::call
(this=0x55cacc0bc300, r=0x55cacc0bbf90, a=0x7ffde4d64050) at
qtbase/src/corelib/kernel/qobjectdefs_impl.h:461
#69206 0x00007f48ceb29fb4 in doActivate<false> (sender=0x55cacc0ee6f0,
signal_index=12, argv=0x7ffde4d64050) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4241
#69207 0x00007f48ceb201a3 in QMetaObject::activate
(sender=0x55cacc0ee6f0, m=0x7f48cd594f88 <QComboBox::staticMetaObject>,
local_signal_index=5, argv=0x7ffde4d64050)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4301
#69208 0x00007f48cc9d826b in QMetaObject::activate<void, int>
(sender=0x55cacc0ee6f0, mo=0x7f48cd594f88 <QComboBox::staticMetaObject>,
local_signal_index=5, ret=0x0, args=@0x7ffde4d64094: 1)
at qtbase/src/corelib/kernel/qobjectdefs.h:319
#69209 0x00007f48ccc6941d in QComboBox::currentIndexChanged
(this=0x55cacc0ee6f0, _t1=1) at
qtbase/src/widgets/Widgets_autogen/include/moc_qcombobox.cpp:367
#69210 0x00007f48ccc67f2a in QComboBoxPrivate::emitCurrentIndexChanged
(this=0x55cac979c770, index=...) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.cpp:1452
#69211 0x00007f48ccc67e58 in QComboBoxPrivate::rowsInserted
(this=0x55cac979c770, parent=..., start=0, end=0) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.cpp:1163
#69212 0x00007f48ccc81c62 in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call(void
(QComboBoxPrivate::*)(QModelIndex const&, int, int), QComboBoxPrivate*,
void**)::{lambda()#1}::operator()() const (this=0x7ffde4d642a0) at
qtbase/src/corelib/kernel/qobjectdefs_impl.h:127
#69213 0x00007f48ccc81bbd in
QtPrivate::FunctorCallBase::call_internal<void,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call(void
(QComboBoxPrivate::*)(QModelIndex const&, int, int), QComboBoxPrivate*,
void**)::{lambda()#1}>(void**,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call(void
(QComboBoxPrivate::*)(QModelIndex const&, int, int), QComboBoxPrivate*,
void**)::{lambda()#1}&&) (args=0x7ffde4d64680, fn=...)
at qtbase/src/corelib/kernel/qobjectdefs_impl.h:65
#69214 0x00007f48ccc81b77 in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call
(f=(void (QComboBoxPrivate::*)(QComboBoxPrivate * const, const
QModelIndex &, int, int)) 0x7f48ccc67c80
<QComboBoxPrivate::rowsInserted(QModelIndex const&, int, int)>,
o=0x55cac979c770, arg=0x7ffde4d64680)
at qtbase/src/corelib/kernel/qobjectdefs_impl.h:126
#69215 0x00007f48ccc81ae1 in QtPrivate::FunctionPointer<void
(QComboBoxPrivate::*)(QModelIndex const&, int,
int)>::call<QtPrivate::List<QModelIndex const&, int, int>, void>
(f=(void (QComboBoxPrivate::*)(QComboBoxPrivate * const, const
QModelIndex &, int, int)) 0x7f48ccc67c80
<QComboBoxPrivate::rowsInserted(QModelIndex const&, int, int)>,
o=0x55cac979c770, arg=0x7ffde4d64680)
at qtbase/src/corelib/kernel/qobjectdefs_impl.h:174
#69216 0x00007f48ccc81a10 in QtPrivate::QPrivateSlotObject<void
(QComboBoxPrivate::*)(QModelIndex const&, int, int),
QtPrivate::List<QModelIndex const&, int, int>, void>::impl
(which=1, this_=0x55cacc10a9c0, r=0x55cacc0ee6f0, a=0x7ffde4d64680,
ret=0x0) at qtbase/src/corelib/kernel/qobject_p.h:272
#69217 0x00007f48ce9061a2 in QtPrivate::QSlotObjectBase::call
(this=0x55cacc10a9c0, r=0x55cacc0ee6f0, a=0x7ffde4d64680) at
qtbase/src/corelib/kernel/qobjectdefs_impl.h:461
#69218 0x00007f48ceb29fb4 in doActivate<false> (sender=0x55cacc0f0a90,
signal_index=13, argv=0x7ffde4d64680) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4241
#69219 0x00007f48ceb201a3 in QMetaObject::activate
(sender=0x55cacc0f0a90, m=0x7f48cf440ce8
<QAbstractItemModel::staticMetaObject>, local_signal_index=10,
argv=0x7ffde4d64680)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4301
#69220 0x00007f48cef6f185 in QMetaObject::activate<void, QModelIndex,
int, int, QAbstractItemModel::QPrivateSignal>
(sender=0x55cacc0f0a90, mo=0x7f48cf440ce8
<QAbstractItemModel::staticMetaObject>, local_signal_index=10, ret=0x0,
args=..., args=@0x7ffde4d646f0: 0, args=@0x7ffde4d646ec: 0, args=...) at
qtbase/src/corelib/kernel/qobjectdefs.h:319
#69221 0x00007f48cef6302a in QAbstractItemModel::rowsInserted
(this=0x55cacc0f0a90, _t1=..., _t2=0, _t3=0, _t4=...) at
qtbase/src/corelib/Core_autogen/include/moc_qabstractitemmodel.cpp:688
#69222 0x00007f48cef62fa6 in QAbstractItemModel::endInsertRows
(this=0x55cacc0f0a90) at
/home/michi/development/git/qt5/qtbase/src/corelib/itemmodels/qabstractitemmodel.cpp:2920
#69223 0x00007f48cde59998 in QStandardItemModelPrivate::rowsInserted
(this=0x55cacc0f19f0, parent=0x55cacc0ef360, row=0, count=1) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:629
#69224 0x00007f48cde59c93 in QStandardItemPrivate::insertRows
(this=0x55cacc0f1680, row=0, count=1, items=...) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:501
#69225 0x00007f48cde5badd in QStandardItem::insertRow
(this=0x55cacc0ef360, row=0, items=...) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:1605
#69226 0x00007f48cde5d93f in QStandardItemModel::insertRow
(this=0x55cacc0f0a90, row=0, items=...) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:2684
#69227 0x00007f48ccc74eca in QStandardItemModel::insertRow
(this=0x55cacc0f0a90, arow=0, aitem=0x55cacc104ff0) at
qtbase/src/gui/itemmodels/qstandarditemmodel.h:400
#69228 0x00007f48ccc6b2b7 in QComboBox::insertItem
(this=0x55cacc0ee6f0, index=0, icon=..., text=..., userData=...) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.cpp:2353
#69229 0x00007f48cf972c77 in QComboBox::insertItem
(this=0x55cacc0ee6f0, aindex=0, atext=..., auserData=...) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.h:227
#69230 0x00007f48cfa39613 in QtInstanceComboBox::insert(int,
rtl::OUString const&, rtl::OUString const*, rtl::OUString const*,
VirtualDevice*)::$_0::operator()() const (this=0x55cacc10b630) at
vcl/qt6/../qt5/QtInstanceComboBox.cxx:45
#69231 0x00007f48cfa394e5 in std::__invoke_impl<void,
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0&>(std::__invoke_other,
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0&) (__f=...) at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/invoke.h:61
#69232 0x00007f48cfa394a5 in std::__invoke_r<void,
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0&>(QtInstanceComboBox::insert(int,
rtl::OUString const&, rtl::OUString const*, rtl::OUString const*,
VirtualDevice*)::$_0&) (__fn=...) at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/invoke.h:111
#69233 0x00007f48cfa3938d in std::_Function_handler<void(),
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0>::_M_invoke (__functor=...)
at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/std_function.h:290
#69234 0x00007f48cf9f9f5e in std::function<void()>::operator()
(this=0x7ffde4d64ed0) at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/std_function.h:591
#69235 0x00007f48cf9f172f in QtInstance::RunInMainThread
(this=0x55cac963d130, func=...) at vcl/qt6/../qt5/QtInstance.cxx:206
#69236 0x00007f48cfa3600f in QtInstanceComboBox::insert
(this=0x55cacc0bbf90, nPos=0, rStr="OpenSymbol", pId=0x0, pIconName=0x0,
pImageSurface=0x0) at vcl/qt6/../qt5/QtInstanceComboBox.cxx:37
#69237 0x00007f48aaecd82f in weld::ComboBox::insert_text
(this=0x55cacc0bc108, pos=0, rStr="OpenSymbol") at include/vcl/weld.hxx:793
#69238 0x00007f48aaecc45a in SmFontPickListBox::SelectHdl
(this=0x55cacbb3fdb0) at
/home/michi/development/git/libreoffice/starmath/source/utility.cxx:142
#69239 0x00007f48aaecc37d in SmFontPickListBox::LinkStubSelectHdl
(instance=0x55cacbb3fdb0, data=...) at
/home/michi/development/git/libreoffice/starmath/source/utility.cxx:134
#69240 0x00007f48cfa3f9e1 in Link<weld::ComboBox&, void>::Call
(this=0x55cacc0bc150, data=...) at include/tools/link.hxx:105
#69241 0x00007f48cfa3f5ec in weld::ComboBox::signal_changed
(this=0x55cacc0bc108) at include/vcl/weld.hxx:766
#69242 0x00007f48cfa3588d in QtInstanceComboBox::signalChanged
(this=0x55cacc0bbf90) at vcl/qt6/../qt5/QtInstanceComboBox.cxx:382
#69243 0x00007f48cfa3fe01 in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)::{lambda()#1}::operator()() const
(this=0x7ffde4d65110) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:127
#69244 0x00007f48cfa3fd39 in
QtPrivate::FunctorCallBase::call_internal<void,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)::{lambda()#1}>(void**,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)::{lambda()#1}&&) (args=0x7ffde4d654d0, fn=...) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:65
#69245 0x00007f48cfa3fc6b in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long>, QtPrivate::List<>,
void, void (QtInstanceComboBox::*)()>::call(void (QtInstanceComboBox::*)(),
QtInstanceComboBox*, void**)
(f=(void (QtInstanceComboBox::*)(QtInstanceComboBox * const))
0x7f48cfa35850 <QtInstanceComboBox::signalChanged()>, o=0x55cacc0bbf90,
arg=0x7ffde4d654d0)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:126
#69246 0x00007f48cfa3fbed in QtPrivate::FunctionPointer<void
(QtInstanceComboBox::*)()>::call<QtPrivate::List<>, void>(void
(QtInstanceComboBox::*)(), QtInstanceComboBox*, void**)
(f=(void (QtInstanceComboBox::*)(QtInstanceComboBox * const))
0x7f48cfa35850 <QtInstanceComboBox::signalChanged()>, o=0x55cacc0bbf90,
arg=0x7ffde4d654d0)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:174
#69247 0x00007f48cfa3fb16 in QtPrivate::QCallableObject<void
(QtInstanceComboBox::*)(), QtPrivate::List<>, void>::impl(int,
QtPrivate::QSlotObjectBase*, QObject*, void**, bool*)
(which=1, this_=0x55cacc0bc300, r=0x55cacc0bbf90, a=0x7ffde4d654d0,
ret=0x0) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobjectdefs_impl.h:545
#69248 0x00007f48ce9061a2 in QtPrivate::QSlotObjectBase::call
(this=0x55cacc0bc300, r=0x55cacc0bbf90, a=0x7ffde4d654d0) at
qtbase/src/corelib/kernel/qobjectdefs_impl.h:461
#69249 0x00007f48ceb29fb4 in doActivate<false> (sender=0x55cacc0ee6f0,
signal_index=12, argv=0x7ffde4d654d0) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4241
#69250 0x00007f48ceb201a3 in QMetaObject::activate
(sender=0x55cacc0ee6f0, m=0x7f48cd594f88 <QComboBox::staticMetaObject>,
local_signal_index=5, argv=0x7ffde4d654d0)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4301
#69251 0x00007f48cc9d826b in QMetaObject::activate<void, int>
(sender=0x55cacc0ee6f0, mo=0x7f48cd594f88 <QComboBox::staticMetaObject>,
local_signal_index=5, ret=0x0, args=@0x7ffde4d65514: 1)
at qtbase/src/corelib/kernel/qobjectdefs.h:319
#69252 0x00007f48ccc6941d in QComboBox::currentIndexChanged
(this=0x55cacc0ee6f0, _t1=1) at
qtbase/src/widgets/Widgets_autogen/include/moc_qcombobox.cpp:367
#69253 0x00007f48ccc67f2a in QComboBoxPrivate::emitCurrentIndexChanged
(this=0x55cac979c770, index=...) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.cpp:1452
#69254 0x00007f48ccc67e58 in QComboBoxPrivate::rowsInserted
(this=0x55cac979c770, parent=..., start=0, end=0) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.cpp:1163
#69255 0x00007f48ccc81c62 in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call(void
(QComboBoxPrivate::*)(QModelIndex const&, int, int), QComboBoxPrivate*,
void**)::{lambda()#1}::operator()() const (this=0x7ffde4d65720) at
qtbase/src/corelib/kernel/qobjectdefs_impl.h:127
#69256 0x00007f48ccc81bbd in
QtPrivate::FunctorCallBase::call_internal<void,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call(void
(QComboBoxPrivate::*)(QModelIndex const&, int, int), QComboBoxPrivate*,
void**)::{lambda()#1}>(void**,
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call(void
(QComboBoxPrivate::*)(QModelIndex const&, int, int), QComboBoxPrivate*,
void**)::{lambda()#1}&&) (args=0x7ffde4d65b00, fn=...)
at qtbase/src/corelib/kernel/qobjectdefs_impl.h:65
#69257 0x00007f48ccc81b77 in
QtPrivate::FunctorCall<std::integer_sequence<unsigned long, 0ul, 1ul, 2ul>,
QtPrivate::List<QModelIndex const&, int, int>, void, void
(QComboBoxPrivate::*)(QModelIndex const&, int, int)>::call
(f=(void (QComboBoxPrivate::*)(QComboBoxPrivate * const, const
QModelIndex &, int, int)) 0x7f48ccc67c80
<QComboBoxPrivate::rowsInserted(QModelIndex const&, int, int)>,
o=0x55cac979c770, arg=0x7ffde4d65b00)
at qtbase/src/corelib/kernel/qobjectdefs_impl.h:126
#69258 0x00007f48ccc81ae1 in QtPrivate::FunctionPointer<void
(QComboBoxPrivate::*)(QModelIndex const&, int,
int)>::call<QtPrivate::List<QModelIndex const&, int, int>, void>
(f=(void (QComboBoxPrivate::*)(QComboBoxPrivate * const, const
QModelIndex &, int, int)) 0x7f48ccc67c80
<QComboBoxPrivate::rowsInserted(QModelIndex const&, int, int)>,
o=0x55cac979c770, arg=0x7ffde4d65b00)
at qtbase/src/corelib/kernel/qobjectdefs_impl.h:174
#69259 0x00007f48ccc81a10 in QtPrivate::QPrivateSlotObject<void
(QComboBoxPrivate::*)(QModelIndex const&, int, int),
QtPrivate::List<QModelIndex const&, int, int>, void>::impl
(which=1, this_=0x55cacc10a9c0, r=0x55cacc0ee6f0, a=0x7ffde4d65b00,
ret=0x0) at qtbase/src/corelib/kernel/qobject_p.h:272
#69260 0x00007f48ce9061a2 in QtPrivate::QSlotObjectBase::call
(this=0x55cacc10a9c0, r=0x55cacc0ee6f0, a=0x7ffde4d65b00) at
qtbase/src/corelib/kernel/qobjectdefs_impl.h:461
#69261 0x00007f48ceb29fb4 in doActivate<false> (sender=0x55cacc0f0a90,
signal_index=13, argv=0x7ffde4d65b00) at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4241
#69262 0x00007f48ceb201a3 in QMetaObject::activate
(sender=0x55cacc0f0a90, m=0x7f48cf440ce8
<QAbstractItemModel::staticMetaObject>, local_signal_index=10,
argv=0x7ffde4d65b00)
at
/home/michi/development/git/qt5/qtbase/src/corelib/kernel/qobject.cpp:4301
#69263 0x00007f48cef6f185 in QMetaObject::activate<void, QModelIndex,
int, int, QAbstractItemModel::QPrivateSignal>
(sender=0x55cacc0f0a90, mo=0x7f48cf440ce8
<QAbstractItemModel::staticMetaObject>, local_signal_index=10, ret=0x0,
args=..., args=@0x7ffde4d65b70: 0, args=@0x7ffde4d65b6c: 0, args=...) at
qtbase/src/corelib/kernel/qobjectdefs.h:319
#69264 0x00007f48cef6302a in QAbstractItemModel::rowsInserted
(this=0x55cacc0f0a90, _t1=..., _t2=0, _t3=0, _t4=...) at
qtbase/src/corelib/Core_autogen/include/moc_qabstractitemmodel.cpp:688
#69265 0x00007f48cef62fa6 in QAbstractItemModel::endInsertRows
(this=0x55cacc0f0a90) at
/home/michi/development/git/qt5/qtbase/src/corelib/itemmodels/qabstractitemmodel.cpp:2920
#69266 0x00007f48cde59998 in QStandardItemModelPrivate::rowsInserted
(this=0x55cacc0f19f0, parent=0x55cacc0ef360, row=0, count=1) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:629
#69267 0x00007f48cde59c93 in QStandardItemPrivate::insertRows
(this=0x55cacc0f1680, row=0, count=1, items=...) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:501
#69268 0x00007f48cde5badd in QStandardItem::insertRow
(this=0x55cacc0ef360, row=0, items=...) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:1605
#69269 0x00007f48cde5d93f in QStandardItemModel::insertRow
(this=0x55cacc0f0a90, row=0, items=...) at
/home/michi/development/git/qt5/qtbase/src/gui/itemmodels/qstandarditemmodel.cpp:2684
#69270 0x00007f48ccc74eca in QStandardItemModel::insertRow
(this=0x55cacc0f0a90, arow=0, aitem=0x55cacbf475e0) at
qtbase/src/gui/itemmodels/qstandarditemmodel.h:400
#69271 0x00007f48ccc6b2b7 in QComboBox::insertItem
(this=0x55cacc0ee6f0, index=0, icon=..., text=..., userData=...) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.cpp:2353
#69272 0x00007f48cf972c77 in QComboBox::insertItem
(this=0x55cacc0ee6f0, aindex=0, atext=..., auserData=...) at
/home/michi/development/git/qt5/qtbase/src/widgets/widgets/qcombobox.h:227
#69273 0x00007f48cfa39613 in QtInstanceComboBox::insert(int,
rtl::OUString const&, rtl::OUString const*, rtl::OUString const*,
VirtualDevice*)::$_0::operator()() const (this=0x55cacbfa0500) at
vcl/qt6/../qt5/QtInstanceComboBox.cxx:45
#69274 0x00007f48cfa394e5 in std::__invoke_impl<void,
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0&>(std::__invoke_other,
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0&) (__f=...) at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/invoke.h:61
#69275 0x00007f48cfa394a5 in std::__invoke_r<void,
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0&>(QtInstanceComboBox::insert(int,
rtl::OUString const&, rtl::OUString const*, rtl::OUString const*,
VirtualDevice*)::$_0&) (__fn=...) at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/invoke.h:111
#69276 0x00007f48cfa3938d in std::_Function_handler<void(),
QtInstanceComboBox::insert(int, rtl::OUString const&, rtl::OUString const*,
rtl::OUString const*, VirtualDevice*)::$_0>::_M_invoke (__functor=...)
at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/std_function.h:290
#69277 0x00007f48cf9f9f5e in std::function<void()>::operator()
(this=0x7ffde4d66350) at
/usr/lib/gcc/x86_64-linux-gnu/14/../../../../include/c++/14/bits/std_function.h:591
#69278 0x00007f48cf9f172f in QtInstance::RunInMainThread
(this=0x55cac963d130, func=...) at vcl/qt6/../qt5/QtInstance.cxx:206
#69279 0x00007f48cfa3600f in QtInstanceComboBox::insert
(this=0x55cacc0bbf90, nPos=0, rStr="NotoSerifTamilSlanted Thin", pId=0x0,
pIconName=0x0, pImageSurface=0x0) at vcl/qt6/../qt5/QtInstanceComboBox.cxx:37
#69280 0x00007f48aaecd82f in weld::ComboBox::insert_text
(this=0x55cacc0bc108, pos=0, rStr="NotoSerifTamilSlanted Thin") at
include/vcl/weld.hxx:793
#69281 0x00007f48aaecc9ce in SmFontPickListBox::Insert
(this=0x55cacbb3fdb0, rFont=...) at
/home/michi/development/git/libreoffice/starmath/source/utility.cxx:169
#69282 0x00007f48aaecc18e in SmFontPickList::ReadFrom
(this=0x55cacbb3fdb0, rDialog=...) at
/home/michi/development/git/libreoffice/starmath/source/utility.cxx:116
#69283 0x00007f48aadfa926 in SmFontTypeDialog::MenuSelectHdl
(this=0x7ffde4d6f5d8, rIdent="math") at
/home/michi/development/git/libreoffice/starmath/source/dialog.cxx:568
#69284 0x00007f48aadfa62d in SmFontTypeDialog::LinkStubMenuSelectHdl
(instance=0x7ffde4d6f5d8, data="math") at
/home/michi/development/git/libreoffice/starmath/source/dialog.cxx:529
#69285 0x00007f48cfa79361 in Link<rtl::OUString const&, void>::Call
(this=0x55cacc103d80, data="math") at include/tools/link.hxx:105
#69286 0x00007f48cfa78941 in weld::MenuButton::signal_selected
(this=0x55cacc103d78, rIdent="math") at include/vcl/weld.hxx:1660
#69287 0x00007f48cfa73c63 in
QtInstanceMenuButton::handleMenuItemTriggered (this=0x55cacc103ba0,
pAction=0x55cacc0d5630) at vcl/qt6/../qt5/QtInstanceMenuButton.cxx:189
[...]
Change-Id: Iea89d6d1c75f38c6e1839da8990c96a88f0e0ddc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184369
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceComboBox.cxx b/vcl/qt5/QtInstanceComboBox.cxx
index 05154e18b525..57fac25a8bf4 100644
--- a/vcl/qt5/QtInstanceComboBox.cxx
+++ b/vcl/qt5/QtInstanceComboBox.cxx
@@ -24,7 +24,7 @@ QtInstanceComboBox::QtInstanceComboBox(QComboBox* pComboBox)
{
assert(pComboBox);
- QObject::connect(m_pComboBox,
QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+ QObject::connect(m_pComboBox, &QComboBox::currentTextChanged, this,
&QtInstanceComboBox::signalChanged);
QObject::connect(m_pComboBox, &QComboBox::editTextChanged, this,
&QtInstanceComboBox::signalChanged);
