diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp
index 21145be89e5e4f4895fa809168532f0650792571..de48f60f563db0973a93cf7549cc4d5a37a70223 100644
--- a/src/qml/qml/qqmlplatform.cpp
+++ b/src/qml/qml/qqmlplatform.cpp
@@ -59,7 +59,7 @@ QQmlPlatform::~QQmlPlatform()
 
 QString QQmlPlatform::os()
 {
-#if defined(Q_OS_LINUX_ANDROID)
+#if defined(Q_OS_ANDROID)
     return QLatin1String("android");
 #elif defined(Q_OS_BLACKBERRY)
     return QLatin1String("blackberry");
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 17115ae8c449fb2018d2d50e2517eb3009759e86..9c73c7d191a0c9cc707f0c5e3d684c32d663eefa 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -63,7 +63,7 @@
 #include <QtCore/qnumeric.h>
 #include <private/qquickwindow_p.h>
 
-#if defined(Q_OS_QNX) || defined(Q_OS_LINUX_ANDROID)
+#if defined(Q_OS_QNX) || defined(Q_OS_ANDROID)
 #include <ctype.h>
 #endif
 
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index c4fceac33d625885e02fa6571ef9b40fc52e25a0..eedc71de92eb06d381ef66660782379826bed56a 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -14,6 +14,9 @@ exists("qqml_enable_gcov") {
 
 QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf
 
+ANDROID_LIB_DEPENDENCY_REPLACEMENTS = \
+    "plugins/platforms/android/libqtforandroid.so:plugins/platforms/android/libqtforandroidGL.so"
+
 load(qt_module)
 
 include(util/util.pri)
diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 1a8c69a47438dd9ee50a48bb5df6effb56ba7290..cd95d9f4457bd415e1855e200f4c8e22c00263ee 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -48,7 +48,7 @@
 #include <private/qqmlprofilerservice_p.h>
 #include <private/qqmlglobal_p.h>
 
-#if defined(Q_OS_LINUX) && !defined(Q_OS_LINUX_ANDROID)
+#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
 #define CAN_BACKTRACE_EXECINFO
 #endif