From 10652f8dd675aa0d12c11597c165831c8ba0b8b4 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 29 Jan 2013 12:19:25 +0100 Subject: Disable desktop settings awareness for now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Loading the KDE and Gnome settings for Wayland clients don't yet make sense. For the platform theme we check to see whether we are in a KDE or Gnome environment, then set the default style hints based on that. Right now for the Wayland platform, it makes more sense to use the generic UNIX platform theme. If there are ever KDE or Gnome Wayland environments available, it may be worth reconsidering, but for now it just causes problems(like the GTK+ style being loaded even though it has X11 dependencies). Change-Id: I13017c46f47ae34df884d2070a239c16ffbee850 Reviewed-by: Jørgen Lind Reviewed-by: J-P Nurmi --- src/plugins/platforms/wayland/qwaylandintegration.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 1edf37e97..7fabdcbae 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -82,6 +82,8 @@ QWaylandIntegration::QWaylandIntegration() #endif { QGuiApplicationPrivate::instance()->setEventDispatcher(mEventDispatcher); + //Disable desktop settings for wayland clients for now + QGuiApplicationPrivate::obey_desktop_settings = false; mDisplay = new QWaylandDisplay(); mClipboard = new QWaylandClipboard(mDisplay); mDrag = new QWaylandDrag(mDisplay); -- cgit v1.2.3