diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-09-29 21:13:25 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-01 08:19:15 +0200 |
| commit | 57e1c9a7bd247e53b7a5f1e7745801e78a9e49fd (patch) | |
| tree | fdb2705334546d0ad41232693aa63b7481e8a517 /src/gui | |
| parent | 660aed3516f91c047383f9759c286e739da9222e (diff) | |
Correct the bit field sizes in QTextOption
There's an off-by-one error that has been carried over since at least
Qt 4.0.0. Because of that, the class is actually 4 bytes bigger than
calculated.
Change-Id: Iaefdf657fdc780aae16390fde3c01074160e4cd9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextoption.cpp | 3 | ||||
| -rw-r--r-- | src/gui/text/qtextoption.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index c939020457..1284207307 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -61,6 +61,7 @@ QTextOption::QTextOption() wordWrap(QTextOption::WordWrap), design(false), unused(0), + unused2(0), f(0), tab(-1), d(0) @@ -78,6 +79,7 @@ QTextOption::QTextOption(Qt::Alignment alignment) wordWrap(QTextOption::WordWrap), design(false), unused(0), + unused2(0), f(0), tab(-1), d(0) @@ -104,6 +106,7 @@ QTextOption::QTextOption(const QTextOption &o) design(o.design), direction(o.direction), unused(o.unused), + unused2(o.unused2), f(o.f), tab(o.tab), d(0) diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index a6818eb79a..3c76768f87 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -134,7 +134,8 @@ private: uint wordWrap : 4; uint design : 1; uint direction : 2; - uint unused : 18; + uint unused : 17; + uint unused2; // ### Qt 6: remove unnecessary, extra 32 bits uint f; qreal tab; QTextOptionPrivate *d; |