From 77fbaeaa2d00205532ba54bdf72ddf46ef4c9566 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 18 Jun 2015 11:02:30 -0500 Subject: [PATCH] startkde.cmake: sync ScaleFactor changes, drop QT_PLUGIN_PATH munging (#1233298) --- plasma-workspace.spec | 5 ++++- startkde.cmake | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 022c20d..3ff725f 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -4,7 +4,7 @@ Name: plasma-workspace Version: 5.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plasma workspace, applications and applets License: GPLv2+ URL: https://projects.kde.org/projects/kde/workspace/plasma-workspace @@ -321,6 +321,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/{plasma-windowed,org %changelog +* Thu Jun 18 2015 Rex Dieter 5.3.1-4 +- startkde.cmake: sync ScaleFactor changes, drop QT_PLUGIN_PATH munging (#1233298) + * Thu Jun 18 2015 Fedora Release Engineering - 5.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/startkde.cmake b/startkde.cmake index e7c731e..27000ca 100644 --- a/startkde.cmake +++ b/startkde.cmake @@ -67,6 +67,7 @@ kcminputrc Mouse cursorTheme 'breeze_cursors' kcminputrc Mouse cursorSize '' ksplashrc KSplash Theme Breeze ksplashrc KSplash Engine KSplashQML +kdeglobals KScreen ScaleFactor 1 kcmfonts General forceFontDPI 0 EOF @@ -94,6 +95,10 @@ if test $returncode -ne 0; then fi [ -r $configDir/startupconfig ] && . $configDir/startupconfig +if test "$kdeglobals_kscreen_scalefactor" -ne 1; then + export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor +fi + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then @EXPORT_XCURSOR_PATH@ @@ -159,10 +164,6 @@ for prefix in `echo $scriptpath`; do done done -# Set the path for Qt plugins provided by KDE -QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir` -export QT_PLUGIN_PATH - # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two