diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-16 10:44:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-16 10:44:02 (GMT) |
| commit | 9e7f0b9e45cef278c8874539257b4038a0aa6615 (patch) | |
| tree | 6f66ec8ea599e348ea550da76612cb3873478a21 /src/gui/text/qtextoption.h | |
| parent | 700a4826cf6bd755df000cb16c259343efb695cd (diff) | |
| parent | 5b5785bc564ccea9f6868d02be3d1080cb5039b9 (diff) | |
| download | Qt-9e7f0b9e45cef278c8874539257b4038a0aa6615.zip Qt-9e7f0b9e45cef278c8874539257b4038a0aa6615.tar.gz Qt-9e7f0b9e45cef278c8874539257b4038a0aa6615.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/text/qtextoption.h')
| -rw-r--r-- | src/gui/text/qtextoption.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index 5af7834..a48efc1 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -136,8 +136,8 @@ private: uint align : 8; uint wordWrap : 4; uint design : 1; - uint direction : 1; - uint unused : 19; + uint direction : 2; + uint unused : 18; uint f; qreal tab; QTextOptionPrivate *d; |