From 5a071f58997daf9c7b8dfe70d76308d412f7cf03 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 25 Feb 2023 23:29:12 +0200 Subject: [PATCH] Android: remove sdk version check for old version current Qt version doesn't even support Android sdk 14 and below. Pick-to: 6.5 Change-Id: I5e06e375d446639211d97f4792401f0f9f8d62f8 Reviewed-by: Juha Vuolle --- .../src/org/qtproject/qt/android/QtServiceDelegate.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java index 0a4a314ec12..4836985cfc1 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java @@ -121,12 +121,8 @@ public class QtServiceDelegate QtNative.setEnvironmentVariable("QT_ANDROID_FONTS_SERIF", "Droid Serif"); QtNative.setEnvironmentVariable("HOME", m_service.getFilesDir().getAbsolutePath()); QtNative.setEnvironmentVariable("TMPDIR", m_service.getCacheDir().getAbsolutePath()); - - if (Build.VERSION.SDK_INT < 14) - QtNative.setEnvironmentVariable("QT_ANDROID_FONTS", "Droid Sans;Droid Sans Fallback"); - else - QtNative.setEnvironmentVariable("QT_ANDROID_FONTS", - "Roboto;Droid Sans;Droid Sans Fallback"); + QtNative.setEnvironmentVariable("QT_ANDROID_FONTS", + "Roboto;Droid Sans;Droid Sans Fallback"); if (loaderParams.containsKey(APPLICATION_PARAMETERS_KEY)) m_applicationParameters = loaderParams.getString(APPLICATION_PARAMETERS_KEY);