From f446774605c6a6bd9fe410179975eace6630b406 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Mon, 21 Jan 2019 18:09:47 -0500 Subject: [PATCH] Prevent use of wayland theme on Linux * Wayland theme is buggy yet enforced by default on Qt 5.11+ on Gnome desktop environment * Resolves #2006 --- src/main.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 548bee79b..22616ae50 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,6 +51,13 @@ int main(int argc, char** argv) #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif +#ifdef Q_OS_LINUX + if (qgetenv("XDG_SESSION_TYPE") == QByteArrayLiteral("wayland")) { + qWarning() << "Warning: disregarding XDG_SESSION_TYPE=wayland"; + qWarning() << "To use wayland anyway, please set QT_QPA_PLATFORM=wayland"; + qunsetenv("XDG_SESSION_TYPE"); + } +#endif Application app(argc, argv); Application::setApplicationName("keepassxc");