Always enable qt5ct

This commit is contained in:
Salt 2020-06-05 05:39:44 -05:00
parent 730b6b5198
commit ecf7365259

View File

@ -370,11 +370,7 @@ step_preexecute() {
fi
unset hasdbus
# kcminit/Qt settings
if has kcminit; then
log "Initializing KDE Control Module settings"
kcminit >/dev/null 2>&1
export XDG_CURRENT_DESKTOP="KDE"
elif has qt5ct; then
if has qt5ct; then
log "Initializing qt5ct"
if [ -z "$QT_QPA_PLATFORMTHEME" ]; then
export QT_QPA_PLATFORMTHEME="qt5ct"
@ -389,6 +385,11 @@ step_preexecute() {
log "Using existing scale factor \"$QT_AUTO_SCREEN_SCALE_FACTOR\"" 2
fi
fi
if has kcminit; then
log "Initializing KDE Control Module settings"
kcminit >/dev/null 2>&1
export XDG_CURRENT_DESKTOP="KDE"
fi
# xhost
if has xhost; then
if xhost +si:localuser:"$(id -un)" >/dev/null 2>&1; then