diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
| commit | 1077edd108129a628195708c787c3922d2270c37 (patch) | |
| tree | 1346bb4e46562b6d6fba22c7e81efa30470044bb /src/gui/text/qtextformat.h | |
| parent | 0e3823d30c2294eb11c205ca11fca55508478151 (diff) | |
| parent | c41153e69336701488385d9194d72e72164b28b8 (diff) | |
Merge remote branch 'origin/master' into refactor
Diffstat (limited to 'src/gui/text/qtextformat.h')
| -rw-r--r-- | src/gui/text/qtextformat.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index ff28eaa1b2..4f4752a26a 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -378,7 +378,8 @@ public: AlignSubScript, AlignMiddle, AlignTop, - AlignBottom + AlignBottom, + AlignBaseline }; enum UnderlineStyle { // keep in sync with Qt::PenStyle! NoUnderline, |