diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-12-24 00:13:25 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-12-24 10:16:21 +0100 |
| commit | 0b3e088d4888307c0beb3d4e670560e45459f4b2 (patch) | |
| tree | 15813ad39c8f8f6a0415af378059c067006c7d9d | |
| parent | 28616cf0989dab2ca2a1710c64f6fb1c1d78c584 (diff) | |
qt: Rename SAL_VCL_QT5_NO_NATIVE and use for all Qt-based VCLs
Instead of evaluating a `SAL_VCL_QT5_NO_NATIVE` environment
variable to determine whether to disable drawing of widgets
using the `QStyle`, evaluate `SAL_VCL_QT_NO_NATIVE` (i.e. without
a Qt version number in the name), and do this for all Qt-based
VCL plugins (qt5, qt6, kf5, kf6), not only qt5.
I don't see a reason why this should be qt5-specific.
Change-Id: I01b427648ef14f918cc692b30c80a7427455324f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161262
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | vcl/README.vars.md | 2 | ||||
| -rw-r--r-- | vcl/qt5/QtData.cxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/vcl/README.vars.md b/vcl/README.vars.md index 92931b51f170..72fa32cd8ae5 100644 --- a/vcl/README.vars.md +++ b/vcl/README.vars.md @@ -66,7 +66,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_QT_NO_NATIVE` - disable `QStyle`'d controls * `SAL_VCL_QT_USE_QFONT` - use `QFont` for text layout and rendering (default is to use cairo) ## Mac diff --git a/vcl/qt5/QtData.cxx b/vcl/qt5/QtData.cxx index cc2883ae80ca..2df26d05481e 100644 --- a/vcl/qt5/QtData.cxx +++ b/vcl/qt5/QtData.cxx @@ -217,10 +217,7 @@ bool QtData::ErrorTrapPop(bool /*bIgnoreError*/) { return false; } bool QtData::noNativeControls() { - static const bool bNoNative - = ((nullptr != getenv("SAL_VCL_QT5_NO_NATIVE")) && (nullptr != ImplGetSVData()) - && ImplGetSVData()->maAppData.mxToolkitName - && ImplGetSVData()->maAppData.mxToolkitName->match("qt5")); + static const bool bNoNative = (getenv("SAL_VCL_QT_NO_NATIVE") != nullptr); return bNoNative; } |