Merge branch 'Plasma/5.11'

9 years ago · 6ca914cdf0
parent dee906fdea a09ddff824
commit 6ca914cdf0
1 changed files with 2 additions and 4 deletions
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@ -26,11 +26,9 @@ fi

 [ -r $configDir/startupconfig ] && . $configDir/startupconfig

-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
-    xrdb -quiet -merge -nocpp <<EOF
-Xft.dpi: $kcmfonts_general_forcefontdpi
+xrdb -quiet -merge -nocpp <<EOF
+Xft.dpi: $QT_WAYLAND_FORCE_DPI
 EOF
-fi

 dl=$DESKTOP_LOCKED
 unset DESKTOP_LOCKED # Don't want it in the environment