From 23b7579e4d82e2c0a840b55adf7817ffb6b4389c Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@digia.com>
Date: Mon, 4 Mar 2013 13:51:32 +0100
Subject: [PATCH] Android support: build fixes
Change-Id: If829341b0baef7b253a386a195d3b5e4238b8103
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
src/qml/qml/qqmlplatform.cpp | 2 +-
src/quick/items/context2d/qquickcontext2d.cpp | 2 +-
src/quick/quick.pro | 3 +++
src/quick/scenegraph/util/qsgtexture.cpp | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp
index 21145be89e..de48f60f56 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 17115ae8c4..9c73c7d191 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 c4fceac33d..eedc71de92 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 1a8c69a474..cd95d9f445 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
--
GitLab