Skip to content

Commit 0ac09e2

Browse files
committed
Android: fix fromHtml() deprecation warning
Pick-to: 6.10 Change-Id: I743796d947825d53e3a6ce38ca8c7757fc540f4f Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
1 parent f9300ea commit 0ac09e2

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ButtonStruct implements View.OnClickListener
3636
{
3737
m_dialog = dialog;
3838
m_id = id;
39-
m_text = Html.fromHtml(text);
39+
m_text = Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY);
4040
}
4141
final QtMessageDialogHelper m_dialog;
4242
private final int m_id;
@@ -50,7 +50,6 @@ public void onClick(View view) {
5050

5151
class QtMessageDialogHelper
5252
{
53-
5453
QtMessageDialogHelper(Activity activity)
5554
{
5655
m_activity = activity;
@@ -90,25 +89,25 @@ private Drawable getIconDrawable()
9089
@UsedFromNativeCode
9190
void setTile(String title)
9291
{
93-
m_title = Html.fromHtml(title);
92+
m_title = Html.fromHtml(title, Html.FROM_HTML_MODE_LEGACY);
9493
}
9594

9695
@UsedFromNativeCode
9796
void setText(String text)
9897
{
99-
m_text = Html.fromHtml(text);
98+
m_text = Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY);
10099
}
101100

102101
@UsedFromNativeCode
103102
void setInformativeText(String informativeText)
104103
{
105-
m_informativeText = Html.fromHtml(informativeText);
104+
m_informativeText = Html.fromHtml(informativeText, Html.FROM_HTML_MODE_LEGACY);
106105
}
107106

108107
@UsedFromNativeCode
109108
void setDetailedText(String text)
110109
{
111-
m_detailedText = Html.fromHtml(text);
110+
m_detailedText = Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY);
112111
}
113112

114113
@UsedFromNativeCode

0 commit comments

Comments
 (0)