From 049cef9ce327af40cf8222976f88d08f103dc364 Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Sat, 10 Aug 2019 22:09:30 +0200
Subject: [PATCH] android: fix build

---
 monero-wallet-gui.pro | 6 +++---
 oshelper.cpp          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index 737a6875..7af571e7 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -337,13 +337,13 @@ linux {
         -llmdb \
         -lsodium \
         -lhidapi-libusb \
-        -lcrypto $$TREZOR_LINKER \
-        -lX11
+        -lcrypto $$TREZOR_LINKER
 
     if(!android) {
         LIBS+= \
             -Wl,-Bdynamic \
-            -lGL
+            -lGL \
+            -lX11
     }
     # currently monero has an issue with "static" build and linunwind-dev,
     # so we link libunwind-dev only for non-Ubuntu distros
diff --git a/oshelper.cpp b/oshelper.cpp
index d3e4d063..c1326c0f 100644
--- a/oshelper.cpp
+++ b/oshelper.cpp
@@ -37,7 +37,7 @@
 #ifdef Q_OS_WIN32
 #include <windows.h>
 #endif
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
 #include <X11/XKBlib.h>
 #undef KeyPress
 #undef KeyRelease
@@ -78,7 +78,7 @@ bool OSHelper::isCapsLock() const
     // platform dependent method of determining if CAPS LOCK is on
 #if defined(Q_OS_WIN32) // MS Windows version
     return GetKeyState(VK_CAPITAL) == 1;
-#elif defined(Q_OS_LINUX) // X11 version
+#elif defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) // X11 version
     Display * d = XOpenDisplay((char*)0);
     bool caps_state = false;
     if (d) {