diff options
| author | David Edmundson <davidedmundson@kde.org> | 2020-01-20 11:08:21 +0000 |
|---|---|---|
| committer | David Edmundson <davidedmundson@kde.org> | 2020-01-20 12:41:51 +0000 |
| commit | 6c7e121738dbf22b1b0acbe2a63481c54053f014 (patch) | |
| tree | a8bf55aa32f7800d8bc66b22644be705164b955f /src/plugins | |
| parent | bab1473b7e20c91287e5ce9685725be21abb7226 (diff) | |
Revert "Do not read Xft.dpi on platforms that shouldn't be using Xft settings"
This reverts commit c7fec68e1936576070d0fbac6cf40b818366d298.
This commit introduces a behavioural change within 5.14.
It's designed to special case plasma with a fix, but in practice it will
cause us more problems.
It will break:
- font size on plasmashell and kwin on xcb which do not use Qt scaling
- xwayland on projectors/headless tests
The original bug of double scaling that this was trying to fix is fixed
by b31852c4caa36cc564e25adbdacfa534e1dfe7c0 which is in 5.14.1 which
works in combination with the environment variables we set in plasma so
this is not needed.
Fixes: QTBUG-81532
Change-Id: I2f1b8ae4aecf7b80be4dbee812e6b4a64244fb1f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 44d0bb3f55..e937464c62 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -41,7 +41,6 @@ #include "qxcbwindow.h" #include "qxcbcursor.h" #include "qxcbimage.h" -#include "qxcbintegration.h" #include "qnamespace.h" #include "qxcbxsettings.h" @@ -50,7 +49,6 @@ #include <QDebug> #include <QtAlgorithms> -#include <qpa/qplatformservices.h> #include <qpa/qwindowsysteminterface.h> #include <private/qmath_p.h> #include <QtGui/private/qhighdpiscaling_p.h> @@ -368,15 +366,6 @@ static QFontEngine::SubpixelAntialiasingType parseXftRgba(const QByteArray& stri void QXcbVirtualDesktop::readXResources() { - const QPlatformServices *services = QXcbIntegration::instance()->services(); - bool useXftConf = false; - if (services) { - const QList<QByteArray> desktopEnv = services->desktopEnvironment().split(':'); - useXftConf = desktopEnv.contains("GNOME") || desktopEnv.contains("UNITY") || desktopEnv.contains("XFCE"); - } - if (!useXftConf) - return; - int offset = 0; QByteArray resources; while (true) { |