Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15

Change-Id: Ie9df84af22570d601db002e391a1a0d97e7cd9e1

1 files changed, 8 insertions, 4 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
index a3bbff4e1a..e84c5d75de 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
@@ -109,7 +109,8 @@ public class QtMessageDialogHelper
         try {
             TypedValue typedValue = new TypedValue();
             m_theme.resolveAttribute(android.R.attr.alertDialogIcon, typedValue, true);
-            return m_activity.getResources().getDrawable(typedValue.resourceId);
+            return m_activity.getResources().getDrawable(typedValue.resourceId,
+                                                         m_activity.getTheme());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -119,7 +120,8 @@ public class QtMessageDialogHelper
         {
             case 1: // Information
                 try {
-                    return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_info);
+                    return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_info,
+                                                                 m_activity.getTheme());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -133,14 +135,16 @@ public class QtMessageDialogHelper
 //                break;
             case 3: // Critical
                 try {
-                    return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert);
+                    return m_activity.getResources().getDrawable(android.R.drawable.ic_dialog_alert,
+                                                                 m_activity.getTheme());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
                 break;
             case 4: // Question
                 try {
-                    return m_activity.getResources().getDrawable(android.R.drawable.ic_menu_help);
+                    return m_activity.getResources().getDrawable(android.R.drawable.ic_menu_help,
+                                                                 m_activity.getTheme());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }