diff --git a/pokerth.pro b/pokerth.pro
index 181b1e2d..d187355a 100755
--- a/pokerth.pro
+++ b/pokerth.pro
@@ -1,8 +1,14 @@
 # QMake pro-file for PokerTH
 
 TEMPLATE = subdirs
-SUBDIRS = pokerth_protocol.pro pokerth_db.pro pokerth_lib.pro pokerth_game.pro
-!mac:!gui_800x480:!client {
+SUBDIRS = pokerth_protocol.pro pokerth_db.pro pokerth_lib.pro
+qml-client{
+    SUBDIRS += pokerth_qml-client.pro
+}
+!qml-client{
+    SUBDIRS += pokerth_game.pro
+}
+!mac:!gui_800x480:!client:!qml-client {
 	SUBDIRS += pokerth_server.pro chatcleaner.pro
 }
 CONFIG += ordered
diff --git a/pokerth_game.pro b/pokerth_game.pro
old mode 100644
new mode 100755
index 01ebe39d..da2b16ab
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -408,11 +408,12 @@ unix:!mac {
 		LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
 		LIB_DIRS = $${PREFIX}/lib \
 			$${PREFIX}/lib64 \
+			$${PREFIX}/lib/x86_64-linux-gnu \
 			$$system(qmake -query QT_INSTALL_LIBS)
 	}
 	android{
-		LIBPATH += $${PREFIX}/lib/armv7
-		LIB_DIRS = $${PREFIX}/lib/armv7
+		LIBPATH += $${PREFIX}/lib/armv5
+		LIB_DIRS = $${PREFIX}/lib/armv5
 	}
 	BOOST_FS = boost_filesystem \
 		boost_filesystem-mt
@@ -522,7 +523,7 @@ unix:!mac {
 			$$BOOST_REGEX \
 			$$BOOST_CHRONO \
 			$$BOOST_SYS
-		!count(BOOST_LIBS, 5):error("Unable to find boost libraries in PREFIX=$${PREFIX}/armv5")
+		!count(BOOST_LIBS, 6):error("Unable to find boost libraries in PREFIX=$${PREFIX}/armv5")
 		LIBS += -ltinyxml
 		LIBS += $$BOOST_LIBS
 		LIBS += -lgsasl -lidn
diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro
old mode 100644
new mode 100755
index 7a331df5..e50cab45
--- a/pokerth_protocol.pro
+++ b/pokerth_protocol.pro
@@ -33,17 +33,24 @@ win32 {
 	DEFINES += _WIN32_WINNT=0x0501
 }
 unix : !mac {
-        INCLUDEPATH += $${PREFIX}/include
-	system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
-	system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
-	system(protoc pokerth.proto --java_out=tests/src)
+	INCLUDEPATH += $${PREFIX}/include
+	android {
+		system(wine protoc.exe pokerth.proto --cpp_out=src/third_party/protobuf)
+		system(wine protoc.exe chatcleaner.proto --cpp_out=src/third_party/protobuf)
+		system(wine protoc.exe pokerth.proto --java_out=tests/src)
+	}
+	!android {
+		system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
+		system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
+		system(protoc pokerth.proto --java_out=tests/src)
+	}
 }
 mac { 
-        # make it x86_64 only
-        CONFIG += x86_64
-        CONFIG -= x86
-        CONFIG -= ppc
-        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+	# make it x86_64 only
+	CONFIG += x86_64
+	CONFIG -= x86
+	CONFIG -= ppc
+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 
 	# for universal-compilation on PPC-Mac uncomment the following line
 	# on Intel-Mac you have to comment this line out or build will fail.
diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
index 5d0ff041..0896ff80 100755
--- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
@@ -35,7 +35,7 @@
 
 #ifdef ANDROID
 #ifndef ANDROID_TEST
-#include "QtGui/5.3.0/QtGui/qpa/qplatformnativeinterface.h"
+#include "QtGui/5.4.0/QtGui/qpa/qplatformnativeinterface.h"
 #include <jni.h>
 #endif
 #endif
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp
index 2d9f9d4c..1a6aeacc 100755
--- a/src/gui/qt/gametable/gametableimpl.cpp
+++ b/src/gui/qt/gametable/gametableimpl.cpp
@@ -69,7 +69,7 @@
 
 #ifdef ANDROID
 #ifndef ANDROID_TEST
-#include "QtGui/5.3.0/QtGui/qpa/qplatformnativeinterface.h"
+#include "QtGui/5.4.0/QtGui/qpa/qplatformnativeinterface.h"
 #include <jni.h>
 #endif
 #endif
diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp
old mode 100644
new mode 100755
index 0ebc9ead..31c197a3
--- a/src/gui/qt/startwindow/startwindowimpl.cpp
+++ b/src/gui/qt/startwindow/startwindowimpl.cpp
@@ -61,7 +61,7 @@
 
 #ifdef ANDROID
 #ifndef ANDROID_TEST
-#include "QtGui/5.3.0/QtGui/qpa/qplatformnativeinterface.h"
+#include "QtGui/5.4.0/QtGui/qpa/qplatformnativeinterface.h"
 #include <jni.h>
 #endif
 #endif
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 19718e75..48fccbf5 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -28,6 +28,23 @@
  * shall include the source code for the parts of OpenSSL used as well       *
  * as that of the covered work.                                              *
  *****************************************************************************/
+#ifdef QML_CLIENT
+//START THE QML SWITCH HERE
+
+#include <QApplication>
+#include "qmlwrapper.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    qmlWrapper *myQml = new qmlWrapper();
+    return app.exec();
+}
+
+#else
+// START OF OLD QT-WIDGETS GUI SECTION
+
+
 #include <boost/asio.hpp>
 #include <iostream>
 #include <cstdlib>
@@ -285,3 +302,7 @@ int main( int argc, char **argv )
 	socket_cleanup();
 	return retVal;
 }
+
+
+// END OF OLD QT-WIDGETS GUI SECTION
+#endif