diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-31 08:53:32 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-12-31 08:53:32 +0900 |
| commit | 0b5f0deb773f850d1b905fafc656f67f5b63de24 (patch) | |
| tree | b5e0ad5a4558a86d9c95a5d14cc3595e0fa2b5d8 /user.h | |
| parent | cbfe29b3435fbe47fee268facbe6a82000fce0ad (diff) | |
| parent | 2c440249052b0d518fccd953a7dc657f9eed7ab7 (diff) | |
| download | libquotient-0b5f0deb773f850d1b905fafc656f67f5b63de24.tar.gz libquotient-0b5f0deb773f850d1b905fafc656f67f5b63de24.zip | |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'user.h')
| -rw-r--r-- | user.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -54,7 +54,8 @@ namespace QMatrixClient Q_INVOKABLE QString bridged() const; Avatar& avatarObject(); - QPixmap avatar(int requestedWidth, int requestedHeight); + QImage avatar(int dimension); + QImage avatar(int requestedWidth, int requestedHeight); QUrl avatarUrl() const; |