summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Vogt <fabian@ritter-vogt.de>2017-08-11 19:16:25 (GMT)
committerFabian Vogt <fabian@ritter-vogt.de>2017-08-14 09:55:02 (GMT)
commit053d54488cdd4c6735998fb3a231b144f69ecf66 (patch)
tree6e38b5eeda03481b52566ae6b029b8dff6b52145
parent592dc9e0bc79e11664c880eb9385ab1b76188af5 (diff)
Set the QtQuick Controls 1 style name explicitly
Summary: It does explicitly what the comment above the export implies. That way this warning on every use of Quick Controls 1 is gone: WARNING: Cannot find style "org.kde.desktop" - fallback: "/usr/lib64/qt5/qml/QtQuick/Controls/Styles/Desktop" Note that I'm not 100% sure that this does not have any ill side effects as I don't quite understand what and where org.kde.desktop is supposed to be. Test Plan: Started plasmashell and plasma-discover both with and without the change, no difference except that the warning is now gone. Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D7257
-rw-r--r--startkde/startkde.cmake1
-rw-r--r--startkde/startplasma.cmake1
2 files changed, 2 insertions, 0 deletions
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 64129cc..9787875 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -97,6 +97,7 @@ 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_1_STYLE=Desktop
export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index d2a8841..3ebe136 100644
--- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake
@@ -52,6 +52,7 @@ 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_1_STYLE=Desktop
export QT_QUICK_CONTROLS_STYLE=org.kde.desktop
#In wayland we want Plasma to use Qt's scaling