summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-14 10:35:51 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-14 10:35:51 +0200
commit7c495cfea96e13dbd8b4f9bfa2fc8ee5d015597f (patch)
treee64c56e73d11c1f0640b280a60c556e0aec557a4 /src/android
parent607462019a1da6241d3f4b6bf6356b7dc0a413d0 (diff)
parentb61ee210e67e5575bc96489908b9c46f7b74ec7a (diff)
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 591cd27844..79e30f0552 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -453,6 +453,7 @@ public class QtActivityDelegate
m_environmentVariables = loaderParams.getString(ENVIRONMENT_VARIABLES_KEY);
String additionalEnvironmentVariables = "QT_ANDROID_FONTS_MONOSPACE=Droid Sans Mono;Droid Sans;Droid Sans Fallback"
+ + "\tQT_ANDROID_FONTS_SERIF=Droid Serif"
+ "\tNECESSITAS_API_LEVEL=" + necessitasApiLevel
+ "\tHOME=" + m_activity.getFilesDir().getAbsolutePath()
+ "\tTMPDIR=" + m_activity.getFilesDir().getAbsolutePath();