summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Martin <[email protected]>2017-05-05 18:42:05 +0200
committerMarco Martin <[email protected]>2017-05-05 19:08:20 +0200
commit2616610ebc514332630a5ec56cbdd5126ded68cf (patch)
tree68424d9b3d91a82f527a01518d68402048ee9226
parent26d855ea63b13068d78b3c363570f9436ae2a791 (diff)
Set our own QQC style at startup
Summary: Set the QtQuickControls style to our own: for QtQuickControls1 it will fall back to Desktop, while it will use our own org.kde.desktop for QtQuickControlsStyle and Kirigami Test Plan: systemsettings redesign uses qstyle qqc style, for both qqc1 and 2 Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D5720
-rw-r--r--startkde/startkde.cmake4
-rw-r--r--startkde/startplasma.cmake5
2 files changed, 9 insertions, 0 deletions
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 135ed1b..2f67bdc 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -94,6 +94,10 @@ fi
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
export QT_AUTO_SCREEN_SCALE_FACTOR=0
+#Set the QtQuickControls style to our own: for QtQuickControls1
+#it will fall back to Desktop, while it will use our own org.kde.desktop
+#for QtQuickControlsStyle and Kirigami
+export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
# 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
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index 59dc7b7..0c0553e 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -49,6 +49,11 @@ if test -z "$dl"; then
esac
fi
+#Set the QtQuickControls style to our own: for QtQuickControls1
+#it will fall back to Desktop, while it will use our own org.kde.desktop
+#for QtQuickControlsStyle and Kirigami
+export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
+
# Activate the kde font directories.
#
# There are 4 directories that may be used for supplying fonts for KDE.