1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Fix merge

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-09-27 20:21:56 +02:00
parent 1d978f1871
commit 63252d2fc0
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 2 additions and 2 deletions

View File

@ -505,5 +505,5 @@ void ChatForm::onAvatarRemoved(int FriendId)
if (FriendId != f->friendId)
return;
avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
}

View File

@ -210,7 +210,7 @@ void FriendWidget::onAvatarRemoved(int FriendId)
return;
isDefaultAvatar = true;
avatar.setPixmap(QPixmap(":img/contact.png"));
avatar->setPixmap(QPixmap(":img/contact.png"));
}
void FriendWidget::mousePressEvent(QMouseEvent *ev)