mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Fix merge
This commit is contained in:
parent
1d978f1871
commit
63252d2fc0
|
@ -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"));
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user