diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-09-04 09:42:09 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-09-04 09:42:09 -0500 |
| commit | cfd213931073b75baf3e170edb1e4aa3554bc858 (patch) | |
| tree | 505d6f157457b0347dab0c4c552a7b0f89f6368c /oshelper.cpp | |
| parent | 346e942e93e556a44b854061d37e64324a6d5a38 (diff) | |
| parent | 049cef9ce327af40cf8222976f88d08f103dc364 (diff) | |
| download | monzero-gui-cfd213931073b75baf3e170edb1e4aa3554bc858.tar.gz monzero-gui-cfd213931073b75baf3e170edb1e4aa3554bc858.tar.xz monzero-gui-cfd213931073b75baf3e170edb1e4aa3554bc858.zip | |
Merge pull request #2346
049cef9 android: fix build (selsta)
Diffstat (limited to 'oshelper.cpp')
| -rw-r--r-- | oshelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |