vcl/qt5/QtInstance.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 99983c3c0b855a3449cf974224fae338b578dbd5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Sep 29 11:32:10 2021 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Sep 29 15:01:14 2021 +0200
qt: Use actual major Qt version number in toolkit ID
This makes the qt6 VCL plugin actually show up as such
instead of "qt5" in "Help" -> "About LibreOffice".
Change-Id: I33804dc779c7f2692be260353dda2edc86ea8544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122809
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 730e722754c9..42b7a8ed8a48 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -224,7 +224,8 @@ QtInstance::QtInstance(std::unique_ptr<QApplication>&
pQApp, bool bUseCairo)
, m_bUpdateFonts(false)
{
ImplSVData* pSVData = ImplGetSVData();
- pSVData->maAppData.mxToolkitName = constructToolkitID(u"qt5");
+ const OUString sToolkit = "qt" + OUString::number(QT_VERSION_MAJOR);
+ pSVData->maAppData.mxToolkitName = constructToolkitID(sToolkit);
// this one needs to be blocking, so that the handling in main thread
// is processed before the thread emitting the signal continues
