diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-05-04 10:41:39 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-05-04 10:41:39 (GMT) |
| commit | 8a706b5133b1ba1d5eb5fdca97e002597d6ff829 (patch) | |
| tree | 5cf57028938262d25ea1894784dd97289184241c /src/gui/text/qtextformat.h | |
| parent | 9625c564877414695a9706acf34bc8719018ef06 (diff) | |
| parent | 60e65cc23bf1df213320604062ef98e40c46d3df (diff) | |
| download | Qt-8a706b5133b1ba1d5eb5fdca97e002597d6ff829.zip Qt-8a706b5133b1ba1d5eb5fdca97e002597d6ff829.tar.gz Qt-8a706b5133b1ba1d5eb5fdca97e002597d6ff829.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into lighthouse-master
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 ff28eaa..4f4752a 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, |