diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-06-20 15:27:46 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-06-22 22:15:33 +0200 |
| commit | 4239a29760ff9748965b4c670d1d4e272f81205d (patch) | |
| tree | 7ea2cc952db9b5ffedc630607f3f25a27d7b63b5 /vcl/unx | |
| parent | f5a2f4739b26428d87a2538988ed114c834f9c72 (diff) | |
kf5/kf6: Don't hardcode reported KF version to 5
Use the Qt major version number instead of a hardcoded "5"
when constructing the toolkit ID, so the upcoming
"kf6" VCL plugin will be reported as such (e.g. in the
"About LibreOffice" dialog), not as "kf5".
Change-Id: I8ff0721b8b22fd4b1ca035def37a84bcc5ffede6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153436
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/kf5/KFSalInstance.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/kf5/KFSalInstance.cxx b/vcl/unx/kf5/KFSalInstance.cxx index 741f01006356..21463e05439a 100644 --- a/vcl/unx/kf5/KFSalInstance.cxx +++ b/vcl/unx/kf5/KFSalInstance.cxx @@ -36,7 +36,8 @@ KFSalInstance::KFSalInstance(std::unique_ptr<QApplication>& pQApp, bool bUseCair : QtInstance(pQApp, bUseCairo) { ImplSVData* pSVData = ImplGetSVData(); - pSVData->maAppData.mxToolkitName = constructToolkitID(u"kf5"); + const OUString sToolkit = u"kf" + OUString::number(QT_VERSION_MAJOR); + pSVData->maAppData.mxToolkitName = constructToolkitID(sToolkit); } bool KFSalInstance::hasNativeFileSelection() const |