修复了linux下登录界面无法找到用户头像和qml中对象总提示某属性循环绑定的问题

zccrs · Dec 15, 2014 · 6875a21 · 6875a21
1 parent cced0da
commit 6875a21
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     QQmlComponent component0(engine, QUrl("qrc:/qml/Api/QQApi.qml"));
     QQCommand *qqapi = qobject_cast<QQCommand *>(component0.create ());
-    qDebug()<<component0.errorString();
+
     engine->rootContext ()->setContextProperty ("myqq", qqapi);
 
     QQmlComponent component(engine, QUrl("qrc:/qml/Utility/SystemTray.qml"));

diff --git a/src/mywidgets/myimage.cpp b/src/mywidgets/myimage.cpp
@@ -307,6 +307,7 @@ void MyImage::reLoad()
         setStatus(Error);
         return;
     }
+
     setImage(image);
 }
 

diff --git a/src/qqstars/qqiteminfo.cpp b/src/qqstars/qqiteminfo.cpp
@@ -401,15 +401,25 @@ QString QQItemInfo::alias() const
 
 QString QQItemInfo::avatar40() const
 {
-    if(isCanUseSetting())
-        return mysettings->value ("avatar-40", "qrc:/images/avatar.png").toString ();
+    if(isCanUseSetting()){
+        QString temp_str =  mysettings->value ("avatar-40", "qrc:/images/avatar.png").toString ();
+        if(temp_str.left(3)!="qrc")
+            temp_str = "file://"+temp_str;
+
+        return temp_str;
+    }
     return "qrc:/images/avatar.png";
 }
 
 QString QQItemInfo::avatar240() const
 {
-    if(isCanUseSetting())
-        return mysettings->value ("avatar-240", "qrc:/images/avatar.png").toString ();
+    if(isCanUseSetting()){
+        QString temp_str =  mysettings->value ("avatar-240", "qrc:/images/avatar.png").toString ();
+        if(temp_str.left(3)!="qrc")
+            temp_str = "file://"+temp_str;
+
+        return temp_str;
+    }
     return "qrc:/images/avatar.png";
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -307,6 +307,7 @@ void MyImage::reLoad() @@
             setStatus(Error);
             return;
         }
         setImage(image);
     }
@@ Expand Down @@