helpcontent2 | 2 +-
vcl/qt5/QtInstanceBuilder.cxx | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b243997d2fc52c525ecb5130d1749f8ac03722a4
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Oct 29 07:00:09 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Oct 29 12:16:47 2024 +0100
tdf#130857 qt weld: Declare support for "About LO" dialog
Add .ui file of the "Help" -> "About LibreOffice(Dev)" dialog
to list of files supported by QtInstanceBuilder, so that native
Qt widgets are used for that dialog now when using the qt5/qt6 VCL
plugins, unless environment variable SAL_VCL_QT_NO_WELDED_WIDGETS=1
is set.
Change-Id: I57c83517e9f7cea16931107206f25f6a9013429c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175772
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx
index 7558bb63a508..259564e78fb3 100644
--- a/vcl/qt5/QtInstanceBuilder.cxx
+++ b/vcl/qt5/QtInstanceBuilder.cxx
@@ -41,6 +41,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString&
rUIFile)
// what is relevant for that particular one, without having to implement
the full
// weld API at once.
static std::unordered_set<OUString> aSupportedUIFiles = {
+ u"cui/ui/aboutdialog.ui"_ustr,
u"cui/ui/optnewdictionarydialog.ui"_ustr,
u"modules/scalc/ui/inputstringdialog.ui"_ustr,
u"modules/schart/ui/insertaxisdlg.ui"_ustr,
commit 3fb8a8f7cd1d21124ca2beb1f54125cbc0730004
Author: Pierre F <f...@bger.ch>
AuthorDate: Tue Oct 29 13:16:40 2024 +0200
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Tue Oct 29 12:16:40 2024 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to 7b7ddc4bf507d27578f3bf17fd28dc40b95d6586
- tdf#143846 split CODE() + CONCATENATE()
Change-Id: Ic190564f4e7a7884900766cee26322f5ab7dfec9
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/175607
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/helpcontent2 b/helpcontent2
index 0568f35bf55b..7b7ddc4bf507 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0568f35bf55b1b028875f84a2108bc209c630eab
+Subproject commit 7b7ddc4bf507d27578f3bf17fd28dc40b95d6586
