Skip to content

Don't try localeFromXkbSymbol w/o __X11__ defined #14949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ywwg merged 1 commit into from
Jun 18, 2025
Merged

Don't try localeFromXkbSymbol w/o __X11__ defined #14949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/coreservices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include "util/sandbox.h"
#endif

#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) && defined(__X11__)
#include <X11/XKBlib.h>
#endif

Expand Down Expand Up @@ -118,7 +118,7 @@ Bool __xErrorHandler(Display* display, XErrorEvent* event, xError* error) {

#endif

#if defined(Q_OS_LINUX)
#if defined(Q_OS_LINUX) && defined(__X11__)
QLocale localeFromXkbSymbol(const QString& xkbLayout) {
// This maps XKB layouts to locales of keyboard mappings that are shipped with Mixxx
static const QMap<QString, QLocale> xkbToLocaleMap = {
Expand Down Expand Up @@ -268,7 +268,7 @@ QString getCurrentXkbLayoutName() {
// to "ibus engine". QGuiApplication::inputMethod() does not work with GNOME and XFCE
// https://bugreports.qt.io/browse/QTBUG-137302
inline QLocale inputLocale() {
#if defined(Q_OS_LINUX)
#if defined(Q_OS_LINUX) && defined(__X11__)
QString layoutName = getCurrentXkbLayoutName();
if (!layoutName.isEmpty()) {
qDebug() << "Keyboard Layout from XKB:" << layoutName;
Expand Down