From b6bfe81f9aa7cf91394e430e7ca12c5567ba459c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 29 May 2021 22:20:46 +0200
Subject: [PATCH] Use HAVE_X11_GLOBALSHORTCUTS

---
 src/config.h.in                                |  1 +
 src/globalshortcuts/globalshortcutsmanager.cpp | 14 ++++++++------
 src/settings/globalshortcutssettingspage.cpp   |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/config.h.in b/src/config.h.in
index bf180f635..ee9192038 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -19,6 +19,7 @@
 #cmakedefine HAVE_QTSPARKLE
 #cmakedefine HAVE_MUSICBRAINZ
 #cmakedefine HAVE_GLOBALSHORTCUTS
+#cmakedefine HAVE_X11_GLOBALSHORTCUTS
 #cmakedefine USE_INSTALL_PREFIX
 
 #cmakedefine HAVE_GSTREAMER
diff --git a/src/globalshortcuts/globalshortcutsmanager.cpp b/src/globalshortcuts/globalshortcutsmanager.cpp
index 13b09c98b..18eda9fbe 100644
--- a/src/globalshortcuts/globalshortcutsmanager.cpp
+++ b/src/globalshortcuts/globalshortcutsmanager.cpp
@@ -42,7 +42,7 @@
 #  include "globalshortcutsbackend-gnome.h"
 #  include "globalshortcutsbackend-mate.h"
 #endif
-#if (defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)) || defined(Q_OS_WIN)
+#if defined(HAVE_X11_GLOBALSHORTCUTS) || defined(Q_OS_WIN)
 #  include "globalshortcutsbackend-system.h"
 #endif
 #ifdef Q_OS_MACOS
@@ -97,11 +97,11 @@ GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent)
   if (!system_backend_)
     system_backend_ = new GlobalShortcutsBackendMacOS(this);
 #endif
-#if defined(Q_OS_WIN)
+#ifdef Q_OS_WIN
   if (!system_backend_)
     system_backend_ = new GlobalShortcutsBackendSystem(this);
 #endif
-#if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+#ifdef HAVE_X11_GLOBALSHORTCUTS
   if (!system_backend_ && IsX11Available())
     system_backend_ = new GlobalShortcutsBackendSystem(this);
 #endif
@@ -190,12 +190,14 @@ void GlobalShortcutsManager::Register() {
   if (use_kde_ && kde_backend_ && kde_backend_->Register()) return;
   if (use_gnome_ && gnome_backend_ && gnome_backend_->Register()) return;
   if (use_mate_ && mate_backend_ && mate_backend_->Register()) return;
-#if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H) // If this system has X11, only use the system backend if X11 is enabled in the global shortcut settings
+
+#ifdef HAVE_X11_GLOBALSHORTCUTS
   if (use_x11_) {
 #endif
-    if (system_backend_)
+    if (system_backend_) {
       system_backend_->Register();
-#if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+    }
+#ifdef HAVE_X11_GLOBALSHORTCUTS
    }
 #endif
 
diff --git a/src/settings/globalshortcutssettingspage.cpp b/src/settings/globalshortcutssettingspage.cpp
index 3ee0f3232..0f5b63886 100644
--- a/src/settings/globalshortcutssettingspage.cpp
+++ b/src/settings/globalshortcutssettingspage.cpp
@@ -79,7 +79,7 @@ GlobalShortcutsSettingsPage::GlobalShortcutsSettingsPage(SettingsDialog *dialog)
   QObject::connect(ui_->button_gnome_open, &QPushButton::clicked, this, &GlobalShortcutsSettingsPage::OpenGnomeKeybindingProperties);
   QObject::connect(ui_->button_mate_open, &QPushButton::clicked, this, &GlobalShortcutsSettingsPage::OpenMateKeybindingProperties);
 #  endif
-#  if defined(HAVE_X11) && defined(HAVE_QPA_QPLATFORMNATIVEINTERFACE_H)
+#  ifdef HAVE_X11_GLOBALSHORTCUTS
   QObject::connect(ui_->checkbox_x11, &QCheckBox::toggled, this, &GlobalShortcutsSettingsPage::ShortcutOptionsChanged);
 #  endif
 #else