monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2346

Browse source 
049cef9 android: fix build (selsta)
This commit is contained in:
luigi1111 2019-09-04 09:42:09 -05:00
commit cfd2139310
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
monero-wallet-gui.pro
View file

@ -338,13 +338,13 @@ linux {
-llmdb \ -llmdb \
-lsodium \ -lsodium \
-lhidapi-libusb \ -lhidapi-libusb \
-lcrypto $$TREZOR_LINKER \ -lcrypto $$TREZOR_LINKER
-lX11
if(!android) { if(!android) {
LIBS+= \ LIBS+= \
-Wl,-Bdynamic \ -Wl,-Bdynamic \
-lGL -lGL \
-lX11
} }
# currently monero has an issue with "static" build and linunwind-dev, # currently monero has an issue with "static" build and linunwind-dev,
# so we link libunwind-dev only for non-Ubuntu distros # so we link libunwind-dev only for non-Ubuntu distros

4
oshelper.cpp
View file

@ -37,7 +37,7 @@
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef Q_OS_LINUX #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#undef KeyPress #undef KeyPress
#undef KeyRelease #undef KeyRelease
@ -78,7 +78,7 @@ bool OSHelper::isCapsLock() const
// platform dependent method of determining if CAPS LOCK is on // platform dependent method of determining if CAPS LOCK is on
#if defined(Q_OS_WIN32) // MS Windows version #if defined(Q_OS_WIN32) // MS Windows version
return GetKeyState(VK_CAPITAL) == 1; 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); Display * d = XOpenDisplay((char*)0);
bool caps_state = false; bool caps_state = false;
if (d) { if (d) {