diff --git a/Qt/Core.pro b/Qt/Core.pro
index 32a78a7d34..e81df4ff51 100755
--- a/Qt/Core.pro
+++ b/Qt/Core.pro
@@ -73,7 +73,7 @@ SOURCES += $$P/Core/*.cpp \ # Core
 armv7: SOURCES += $$P/GPU/Common/TextureDecoderNEON.cpp
 
 arm: SOURCES += $$P/GPU/GLES/VertexDecoderArm.cpp
-else:SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp
+x86: SOURCES += $$P/GPU/GLES/VertexDecoderX86.cpp
 
 HEADERS += $$P/Core/*.h \
 	$$P/Core/Debugger/*.h \
@@ -94,4 +94,3 @@ HEADERS += $$P/Core/*.h \
 	$$P/ext/xbrz/*.h
 
 win32: INCLUDEPATH += $$P/ffmpeg/WindowsInclude
-
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index a94487c127..9c2820f03a 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -11,8 +11,7 @@ lessThan(QT_MAJOR_VERSION, 5) {
 }
 
 # Extra Qt modules
-linux: CONFIG += link_pkgconfig
-linux:lessThan(QT_MAJOR_VERSION,5):!packagesExist(QtMultimedia) {
+linux:lessThan(QT_MAJOR_VERSION,5):!exists($$[QT_INSTALL_HEADERS]/QtMultimedia) {
 	# Ubuntu et al workaround. They forgot QtMultimedia
 	CONFIG += mobility
 	MOBILITY += multimedia
@@ -40,7 +39,7 @@ macx:	QMAKE_LIBDIR += $$P/ffmpeg/macosx/x86_64/lib/
 ios:	QMAKE_LIBDIR += $$P/ffmpeg/ios/universal/lib/
 qnx:	QMAKE_LIBDIR += $$P/ffmpeg/blackberry/armv7/lib/
 symbian:QMAKE_LIBDIR += $$P/ffmpeg/symbian/armv6/lib/
-android:QMAKE_LIBDIR += $$P/ffmpeg/android/armv6/lib/
+android:QMAKE_LIBDIR += $$P/ffmpeg/android/armv7/lib/
 
 contains(DEFINES, USE_FFMPEG): LIBS += -lavformat -lavcodec -lavutil -lswresample -lswscale
 
@@ -57,6 +56,7 @@ win32 {
 linux:!android {
 	LIBS += -ldl -lrt -lz
 	PRE_TARGETDEPS += $$CONFIG_DIR/libCommon.a $$CONFIG_DIR/libCore.a $$CONFIG_DIR/libNative.a
+	CONFIG += link_pkgconfig
 	packagesExist(sdl) {
 		DEFINES += QT_HAS_SDL
 		SOURCES += $$P/SDL/SDLJoystick.cpp
@@ -67,10 +67,10 @@ linux:!android {
 macx: LIBS += -liconv
 qnx: LIBS += -lscreen
 symbian: LIBS += -lremconcoreapi -lremconinterfacebase
-contains(QT_CONFIG, system-zlib) {
-	unix: LIBS += -lz
-}
 android: LIBS += -lEGL
+unix:contains(QT_CONFIG, system-zlib) {
+	LIBS += -lz
+}
 
 # Main
 SOURCES += $$P/native/base/QtMain.cpp
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 537e5d0d78..5321fd31f0 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -1,8 +1,8 @@
 VERSION = 0.9.8
 DEFINES += USING_QT_UI USE_FFMPEG
-unix:!qnx:!symbian:!android:!mac: CONFIG += linux
+unix:!qnx:!symbian:!mac: CONFIG += linux
 maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo
-arm:!symbian:!android: CONFIG += armv7
+arm:!symbian: CONFIG += armv7
 
 # Global specific
 win32:CONFIG(release, debug|release): CONFIG_DIR = $$join(OUT_PWD,,,/release)
@@ -12,7 +12,7 @@ OBJECTS_DIR = $$CONFIG_DIR/.obj/$$TARGET
 MOC_DIR = $$CONFIG_DIR/.moc/$$TARGET
 UI_DIR = $$CONFIG_DIR/.ui/$$TARGET
 P = $$_PRO_FILE_PWD_/..
-INCLUDEPATH += $$P/ext/zlib $$P/native/ext/glew $$P/Common
+INCLUDEPATH += $$P/ext/zlib $$P/Common
 
 exists($$P/.git): GIT_VERSION = '\\"$$system(git describe --always)\\"'
 isEmpty(GIT_VERSION): GIT_VERSION = '\\"$$VERSION\\"'
@@ -30,8 +30,11 @@ win32-msvc* {
 	DEFINES += __STDC_CONSTANT_MACROS
 	QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter
 	QMAKE_CXXFLAGS += -ffast-math -fno-strict-aliasing
-	maemo: QMAKE_CXXFLAGS += -std=gnu++0x
-	else: QMAKE_CXXFLAGS += -std=c++0x
+	greaterThan(QT_MAJOR_VERSION,4): CONFIG+=c++11
+	else {
+		maemo: QMAKE_CXXFLAGS += -std=gnu++0x
+		else: QMAKE_CXXFLAGS += -std=c++0x
+	}
 	QMAKE_CFLAGS_RELEASE -= -O2
 	QMAKE_CFLAGS_RELEASE += -O3
 	QMAKE_CXXFLAGS_RELEASE -= -O2
@@ -42,58 +45,49 @@ xarch = $$find(QT_ARCH, "86")
 contains(QT_ARCH, windows)|count(xarch, 1) {
 	!win32-msvc*: QMAKE_CXXFLAGS += -msse2
 	CONFIG += x86
-}
-else { # Assume ARM
+} else { # Assume ARM
 	DEFINES += ARM
 	CONFIG += arm
-	CONFIG += mobile_platform
 }
 
-gleslib = $$lower($$QMAKE_LIBS_OPENGL)
-gleslib = $$find(gleslib, "gles")
-android|maemo|!count(gleslib,0) {
-	DEFINES += USING_GLES2
-	DEFINES += MOBILE_DEVICE
+gleslib = $$find(QT_CONFIG, "opengles")
+count(gleslib,0) { # OpenGL
+	INCLUDEPATH += $$P/native/ext/glew
+} else {
+	DEFINES += USING_GLES2 MOBILE_DEVICE
+	CONFIG += mobile_platform
 }
 
 # Platform specific
 contains(MEEGO_EDITION,harmattan): DEFINES += MEEGO_EDITION_HARMATTAN "_SYS_UCONTEXT_H=1"
 maemo5: DEFINES += MAEMO
-maemo {
-	# Does not yet support FFMPEG
-	DEFINES -= USE_FFMPEG
-}
 
-macx {
-	INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
-	#the qlist headers include <initializer_list> in QT5
-	greaterThan(QT_MAJOR_VERSION,4):CONFIG+=c++11
-}
+macx: INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
+ios: INCLUDEPATH += $$P/ffmpeg/ios/universal/include
 
-ios {
-	INCLUDEPATH += $$P/ffmpeg/ios/universal/include
+linux:!android {
+	arm: INCLUDEPATH += $$P/ffmpeg/linux/arm/include
+	x86 {
+		contains(QT_ARCH, x86_64): QMAKE_TARGET.arch = x86_64
+		else: QMAKE_TARGET.arch = x86
+		INCLUDEPATH += $$P/ffmpeg/linux/$${QMAKE_TARGET.arch}/include
+	}
 }
-
-linux:!mobile_platform {
-	contains(QT_ARCH, x86_64): QMAKE_TARGET.arch = x86_64
-	else: QMAKE_TARGET.arch = x86
-	INCLUDEPATH += $$P/ffmpeg/linux/$${QMAKE_TARGET.arch}/include
-}
-linux:mobile_platform: INCLUDEPATH += $$P/ffmpeg/linux/arm/include
 qnx {
 	# Use mkspec: unsupported/qws/qnx-armv7-g++
 	DEFINES += BLACKBERRY "_QNX_SOURCE=1" "_C99=1"
 	INCLUDEPATH += $$P/ffmpeg/blackberry/armv7/include
 }
 symbian {
-	# Does not seem to be a way to change to armv6 compile so just override in variants.xml (see README)
+	# Does not seem to be a way to change to armv6 compile so just override in variants.xml (see Wiki)
 	DEFINES += "BOOST_COMPILER_CONFIG=\"$$EPOCROOT/epoc32/include/stdapis/boost/mpl/aux_/config/gcc.hpp\""
 	QMAKE_CXXFLAGS += -marm -Wno-parentheses -Wno-comment
 	INCLUDEPATH += $$EPOCROOT/epoc32/include/stdapis
 	INCLUDEPATH += $$P/ffmpeg/symbian/armv6/include
 }
 android {
-	DEFINES += ANDROID
+	DEFINES += ANDROID ARMEABI_V7A ARMV7
+	QMAKE_CXXFLAGS += -march=armv7
 	INCLUDEPATH += $$P/native/ext/libzip
-	INCLUDEPATH += $$P/ffmpeg/android/armv6/include
+	INCLUDEPATH += $$P/ffmpeg/android/armv7/include
 }