增加了qml TextEdit对gif图的支持

zccrs · Nov 6, 2014 · 057ae05 · 057ae05
1 parent 917d9aa
commit 057ae05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/qqstars/qqiteminfo.h b/src/qqstars/qqiteminfo.h
@@ -1,7 +1,6 @@
 #ifndef QQITEMINFO_H
 #define QQITEMINFO_H
 
-#include <QQuickItem>
 #include <QtSql>
 #include <QSettings>
 #include <QObject>
@@ -134,7 +133,7 @@ class QQItemInfo:public QObject
     enum QQItemType{
         Friend,//好友
         Group,//群
-        Discu,//讨论组
+        Discu//讨论组
     };
 
 private:

diff --git a/src/qqstars/qqstars.cpp b/src/qqstars/qqstars.cpp
@@ -13,7 +13,7 @@ QQCommand *QQCommand::getFirstQQCommand()
     return firstQQCommand;
 }
 
-QQCommand::QQCommand(QQuickItem *parent) :
+QQCommand::QQCommand( QObject *parent) :
     FriendInfo(parent)
 {
     if(firstQQCommand==NULL)

diff --git a/src/qqstars/qqstars.h b/src/qqstars/qqstars.h
@@ -5,6 +5,8 @@
 #include <QDebug>
 #include <QByteArray>
 #include <QTimer>
+#include <QQuickItem>
+#include <QJSEngine>
 #include "qqiteminfo.h"
 
 class MyWindow;
@@ -31,7 +33,7 @@ class QQCommand : public FriendInfo
     static QQCommand *firstQQCommand;
 public:
     static QQCommand *getFirstQQCommand();//返回第一个被创建的QQCommand对象
-    explicit QQCommand(QQuickItem *parent = 0);
+    explicit QQCommand( QObject *parent = 0);
     enum LoginStatus{//登录状态
         WaitLogin,//离线
         Logining,//登录中