From dbcd84624c3c92864fb669a953363bdcf558d75b Mon Sep 17 00:00:00 2001
From: chenyong <chenyong@star-net.cn>
Date: Thu, 29 Sep 2016 19:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A1=86=E7=B2=98=E8=B4=B4=E5=90=8E=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=EF=BC=9B=20=E4=BF=AE=E5=A4=8D=E6=9F=90?=
 =?UTF-8?q?=E4=BA=9B=E8=A1=A8=E6=83=85=E6=B2=A1=E8=AF=86=E5=88=AB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mainwindow.ui    | 3 +++
 recvtextedit.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index e433872..6ba80f6 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -90,6 +90,9 @@
         <property name="lineWidth">
          <number>1</number>
         </property>
+        <property name="acceptRichText">
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
      </layout>
diff --git a/recvtextedit.cpp b/recvtextedit.cpp
index 8c5a600..118ece5 100644
--- a/recvtextedit.cpp
+++ b/recvtextedit.cpp
@@ -207,7 +207,7 @@ QString RecvTextEdit::textHtmlStr(const TextContent *content)
     for (auto i = 0; i < EMOJI_LEN; i++)
     {
          auto resName = QString(":/default/res/face/")+QString::number(i+1)+".gif";
-         auto emojiStr = g_emojis[i];
+         auto emojiStr = QString(g_emojis[i]).toHtmlEscaped();
          QString imgTag = "<img src=\""+resName+"\"/>";
          htmlStr.replace(emojiStr, imgTag);
     }