diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
index dc48768c..417f5b0d 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
@@ -97,9 +97,9 @@ void changeCompleteBlindsDialogImpl::sortBlindsList()
 
 bool changeCompleteBlindsDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_afterThisAlwaysRaiseValue->hasFocus()) {
diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
index 868126d0..5544ee38 100644
--- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
+++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp
@@ -113,9 +113,9 @@ void changeContentDialogImpl::saveContent()
 
 bool changeContentDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(lineEdit->hasFocus()) {
diff --git a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
index 251e4540..60d87147 100644
--- a/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
+++ b/src/gui/qt/createinternetgamedialog/createinternetgamedialogimpl.cpp
@@ -235,9 +235,9 @@ void createInternetGameDialogImpl::gameTypeChanged()
 
 bool createInternetGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_startCash->hasFocus()) {
diff --git a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
index b48f589f..80f6e10c 100644
--- a/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp
@@ -132,9 +132,9 @@ void createNetworkGameDialogImpl::callChangeBlindsDialog(bool show)
 
 bool createNetworkGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_startCash ->hasFocus()) {
diff --git a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp
index 1c5b40f8..2caa4899 100644
--- a/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp
+++ b/src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp
@@ -152,9 +152,9 @@ void internetGameLoginDialogImpl::okButtonCheck()
 
 bool internetGameLoginDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(lineEdit_username->hasFocus()) {
diff --git a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
index d2b13143..e258fe4b 100755
--- a/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
+++ b/src/gui/qt/newlocalgamedialog/newgamedialogimpl.cpp
@@ -84,9 +84,9 @@ void newGameDialogImpl::callChangeBlindsDialog(bool show)
 
 bool newGameDialogImpl::eventFilter(QObject *obj, QEvent *event)
 {
+#ifdef ANDROID
 	QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
 
-#ifdef ANDROID
 	//androi changes for return key behavior (hopefully useless from necessitas beta2)
 	if (event->type() == QEvent::KeyPress && keyEvent->key() == Qt::Key_Return) {
 		if(spinBox_gameSpeed->hasFocus()) {