commit eb9b5ec7620f236243636cd94f517fc80006b95a
author Khaled Hosny <khaled@libreoffice.org> Sat Jul 08 22:42:12 2023 +0300
committer Michael Stahl <michael.stahl@allotropia.de> Tue Jul 11 11:33:44 2023 +0200
tree de4c71aa14cbb991a89ee0a46e713e36ebd0ead3
parent 1e9e2ff5316a6d934205f1c01a57f80ef4e8657d

tdf#151273, tdf#151925: Don’t use QFont text layout by default

We were enabling QFont for qt5 VCL plugin by default, but it is buggy
and some distributions seem to enabled qt5 VCL plugin even if we don't
recommend it.

Since the QFont code is incomplete and no one is working on it, lets
make people’s life easier by making it always off by default.

This removed the SAL_VCL_QT5_USE_CAIRO envvar and replaces it with
SAL_VCL_QT_USE_QFONT that does the reverse. Also SAL_VCL_KF5_USE_QFONT
is dropped in favor of SAL_VCL_QT_USE_QFONT.

Change-Id: Id7471acd12fe277908f567140b63ae8d27b03033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154222
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
(cherry picked from commit f9b16330f13d3ad43de6de026206577bfa1ac85d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154184
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 14fe410e0ab90e95141613b77de48063f518d9bb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154256
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

static/emscripten/environment.js

diff --git a/static/emscripten/environment.js b/static/emscripten/environment.js
index bc60fdd..7d04fd7 100644
--- a/static/emscripten/environment.js
+++ b/static/emscripten/environment.js
@@ -1,5 +1,4 @@
if (!('preRun' in Module)) Module['preRun'] = [];
Module.preRun.push(function() {
    ENV.SAL_LOG = "+WARN"
    ENV.SAL_VCL_QT5_USE_CAIRO = "1"
});

vcl/README.vars.md

diff --git a/vcl/README.vars.md b/vcl/README.vars.md
index c83ca65..5607dfa 100644
--- a/vcl/README.vars.md
+++ b/vcl/README.vars.md
@@ -62,11 +62,7 @@ will be used to write the log under `instdir/uitest/`.
* `QT_SCALE_FACTOR=2` - for HiDPI testing (also supports float)
* `SAL_VCL_QT5_NO_FONTCONFIG` - ignore fontconfig provided font substitutions
* `SAL_VCL_QT5_NO_NATIVE` - disable `QStyle`'d controls
* `SAL_VCL_QT5_USE_CAIRO` - use cairo for text rendering and fonts (default for kf5, but not qt5)

## Kf5

* `SAL_VCL_KF5_USE_QFONT` - use `QFont` for text rendering (default for qt5, but not kf5)
* `SAL_VCL_QT_USE_QFONT` - use `QFont` for text layout and rendering (default is to use cairo)

## Mac

vcl/qt5/QtInstance.cxx

diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 9c4d3de..df3df5d 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -751,7 +751,7 @@ void QtInstance::setActivePopup(QtFrame* pFrame)
extern "C" {
VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance()
{
    static const bool bUseCairo = (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
    static const bool bUseCairo = (nullptr == getenv("SAL_VCL_QT_USE_QFONT"));

    std::unique_ptr<char* []> pFakeArgv;
    std::unique_ptr<int> pFakeArgc;

vcl/unx/kf5/KF5SalInstance.cxx

diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
index de3e2fe..df5108e 100644
--- a/vcl/unx/kf5/KF5SalInstance.cxx
+++ b/vcl/unx/kf5/KF5SalInstance.cxx
@@ -70,7 +70,7 @@ KF5SalInstance::createPicker(css::uno::Reference<css::uno::XComponentContext> co
extern "C" {
VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance()
{
    static const bool bUseCairo = (nullptr == getenv("SAL_VCL_KF5_USE_QFONT"));
    static const bool bUseCairo = (nullptr == getenv("SAL_VCL_QT_USE_QFONT"));

    std::unique_ptr<char* []> pFakeArgv;
    std::unique_ptr<int> pFakeArgc;