Commit e7b183f8 authored by David Edmundson's avatar David Edmundson

Load QtQuick settings

Summary:
Loads settings on whether QtQuick uses GL or software rendering

Aurorae needed a fix. The rest "just works" with up-to-date plasma framework.

Test Plan:
Alt tabbed
Showed an OSD
Grepped kwin's QML for any custom shaders.
(which is the only part that doesn't work here)

Reviewers: #plasma, graesslin

Reviewed By: #plasma, graesslin

Subscribers: graesslin, plasma-devel, kwin, #kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D8040
parent 54b36325
......@@ -555,6 +555,7 @@ set(kwin_KDE_LIBS
KF5::Package
KF5::Plasma
KF5::WindowSystem
KF5::QuickAddons
KDecoration2::KDecoration
KDecoration2::KDecoration2Private
PW::KScreenLocker
......
......@@ -35,6 +35,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KLocalizedString>
#include <KPluginLoader>
#include <KPluginMetaData>
#include <KQuickAddons/QtQuickSettings>
// Qt
#include <qplatformdefs.h>
#include <QAbstractEventDispatcher>
......@@ -547,6 +549,7 @@ int main(int argc, char * argv[])
setenv("QT_QPA_PLATFORM", "wayland", true);
KWin::Application::createAboutData();
KQuickAddons::QtQuickSettings::init();
const auto availablePlugins = KPluginLoader::findPlugins(QStringLiteral("org.kde.kwin.waylandbackends"));
auto hasPlugin = [&availablePlugins] (const QString &name) {
......
......@@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KLocalizedString>
#include <KPluginLoader>
#include <KPluginMetaData>
#include <KQuickAddons/QtQuickSettings>
// Qt
#include <qplatformdefs.h>
#include <QComboBox>
......@@ -412,6 +413,7 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
a.setupTranslator();
KWin::Application::createAboutData();
KQuickAddons::QtQuickSettings::init();
QCommandLineOption replaceOption(QStringLiteral("replace"), i18n("Replace already-running ICCCM2.0-compliant window manager"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment