diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-01-21 11:36:43 +0100 |
| commit | bf96cfa0d75d256e036c76ec64f0f456014f2739 (patch) | |
| tree | 3ab0ff603dfccb9f28040af3a1559b01af09aa3f /framework/mail/maillistmodel.h | |
| parent | e4e11ba46f4ccce5f9ca63ab758a132d945061e8 (diff) | |
| parent | 9a3059769a0bf9dbf81e523c9245d2aa98420bb5 (diff) | |
| download | kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.tar.gz kube-bf96cfa0d75d256e036c76ec64f0f456014f2739.zip | |
Merge remote-tracking branch 'origin/dev/libotp' into develop
Conflicts:
framework/mail/CMakeLists.txt
Diffstat (limited to 'framework/mail/maillistmodel.h')
| -rw-r--r-- | framework/mail/maillistmodel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/mail/maillistmodel.h b/framework/mail/maillistmodel.h index 22146eac..1d56e6b8 100644 --- a/framework/mail/maillistmodel.h +++ b/framework/mail/maillistmodel.h | |||
| @@ -47,7 +47,8 @@ public: | |||
| 47 | Important, | 47 | Important, |
| 48 | Id, | 48 | Id, |
| 49 | MimeMessage, | 49 | MimeMessage, |
| 50 | DomainObject | 50 | DomainObject, |
| 51 | RenderedMessage | ||
| 51 | }; | 52 | }; |
| 52 | 53 | ||
| 53 | QHash<int, QByteArray> roleNames() const; | 54 | QHash<int, QByteArray> roleNames() const; |