diff --git a/shell/main.cpp b/shell/main.cpp --- a/shell/main.cpp +++ b/shell/main.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include @@ -50,7 +49,7 @@ //On wayland, it's different. Everything is simpler as all co-ordinates are in the same co-ordinate system //we don't have fractional scaling on the client so don't hit most the remaining bugs and //even if we don't use Qt scaling the compositor will try to scale us anyway so we have no choice - if (KWindowSystem::isPlatformX11()) { + if (!qEnvironmentVariableIsSet("PLASMA_USE_QT_SCALING")) { qunsetenv("QT_DEVICE_PIXEL_RATIO"); QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); } diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -54,6 +54,9 @@ #for QtQuickControlsStyle and Kirigami export QT_QUICK_CONTROLS_STYLE=org.kde.desktop +#In wayland we want Plasma to use Qt's scaling +export PLASMA_USE_QT_SCALING=1 + # Activate the kde font directories. # # There are 4 directories that may be used for supplying fonts for KDE.