diff options
Diffstat (limited to 'vcl/qt5/QtBuilder.cxx')
| -rw-r--r-- | vcl/qt5/QtBuilder.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx index b6b1d73748c7..bdf9848485a0 100644 --- a/vcl/qt5/QtBuilder.cxx +++ b/vcl/qt5/QtBuilder.cxx @@ -63,11 +63,15 @@ QString convertAccelerator(const OUString& rText) QtBuilder::QtBuilder(QWidget* pParent, std::u16string_view sUIRoot, const OUString& rUIFile) : WidgetBuilder(sUIRoot, rUIFile, false) { - processUIFile(pParent); + SolarMutexGuard g; - // tweak widget hierarchy (remove unnecessary parent widgets) - for (const std::pair<QWidget*, QWidget*>& rPair : m_aWidgetReplacements) - replaceWidget(rPair.first, rPair.second); + GetQtInstance().RunInMainThread([&] { + processUIFile(pParent); + + // tweak widget hierarchy (remove unnecessary parent widgets) + for (const std::pair<QWidget*, QWidget*>& rPair : m_aWidgetReplacements) + replaceWidget(rPair.first, rPair.second); + }); } QtBuilder::~QtBuilder() {} @@ -361,6 +365,7 @@ QObject* QtBuilder::makeObject(QObject* pParent, std::u16string_view sName, std: const Image aImage = loadThemeImage(sIconName); pToolButton->setIcon(toQPixmap(aImage)); } + pToolButton->setText(toQString(extractLabel(rMap))); pObject = pToolButton; } else if (sName == u"GtkTreeView") |