diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-11-06 12:26:39 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-11-06 12:26:39 +0300 |
| commit | 46c4f6d01130a50ab829daabe52c6bee804cabef (patch) | |
| tree | 0ccc77cbc4f5ae9e06c0db50e74bb75673adb0bc /src/gui/connectionvalidator.h | |
| parent | 865a6f5211a191130d65ccb599d9e668248e14dc (diff) | |
| parent | 3c04eb7b5adbedf5f7aadb16c51cbc7eafe3544e (diff) | |
Merge remote-tracking branch 'origin/2.7' into master
Diffstat (limited to 'src/gui/connectionvalidator.h')
| -rw-r--r-- | src/gui/connectionvalidator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/connectionvalidator.h b/src/gui/connectionvalidator.h index 1fcc0dc62..609216d39 100644 --- a/src/gui/connectionvalidator.h +++ b/src/gui/connectionvalidator.h @@ -123,7 +123,7 @@ protected slots: void slotCapabilitiesRecieved(const QJsonDocument &); void slotUserFetched(const QJsonDocument &); #ifndef TOKEN_AUTH_ONLY - void slotAvatarImage(const QImage &img); + void slotAvatarImage(const QPixmap &img); #endif private: |