Compilation fixes under Embedded Linux (for ARM) envvironment.

Needed to properly compile GoldenDict for Kindle eInk readers.

goldendict.pro

@@ -66,8 +66,11 @@ unix:!mac {
     	vorbis \
 	ogg \
 	hunspell
-    LIBS += -lX11 \
-        -lXtst
+    arm {
+        LIBS += -liconv
+    } else {
+        LIBS += -lX11 -lXtst
+    }
     PREFIX = $$(PREFIX)
     isEmpty( PREFIX ):PREFIX = /usr/local
     DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"

hotkeywrapper.cc

@@ -65,7 +65,7 @@ HotkeyStruct::HotkeyStruct( quint32 key_, quint32 key2_, quint32 modifier_,
 
 //////////////////////////////////////////////////////////////////////////
 
-#ifndef Q_WS_MAC
+#if !defined(Q_OS_MAC) && !defined(Q_WS_QWS)
 HotkeyWrapper::HotkeyWrapper(QObject *parent) : QThread( parent ),
     state2(false)
 {

hotkeywrapper.hh

@@ -32,7 +32,7 @@ struct HotkeyStruct
 
 //////////////////////////////////////////////////////////////////////////
 
-#ifndef Q_OS_MAC
+#if !defined(Q_OS_MAC) && !defined(Q_WS_QWS)
 class HotkeyWrapper : public QThread // Thread is actually only used on X11
 {
   Q_OBJECT

keyboardstate.cc

@@ -6,7 +6,7 @@
 
 #ifdef Q_OS_WIN32
 #include <windows.h>
-#else
+#elif defined(Q_WS_X11)
 #include <QX11Info>
 #include <X11/X.h>
 #include <X11/XKBlib.h>
@@ -14,7 +14,7 @@
 
 bool KeyboardState::checkModifiersPressed( int mask )
 {
-  #ifdef Q_OS_MAC
+  #if defined(Q_OS_MAC) || defined(Q_WS_QWS)
     return false;
   #elif defined Q_OS_WIN32