diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:42:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:44:18 +0200 |
| commit | d8fc0da235b2bd566b2b6f1e21218afdf2f34eb3 (patch) | |
| tree | c0ca819521ed6901a83ab476fa822a886691d806 /src/gui/text/qtextoption.h | |
| parent | 3649a6e61d823289d18be19387d7e3923dd90bd0 (diff) | |
| parent | cdf0c5905b3477c6cd01c519f883b7bb55447120 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
Change-Id: Ica85deeab5c5038ac004718e25194b1157343480
Diffstat (limited to 'src/gui/text/qtextoption.h')
| -rw-r--r-- | src/gui/text/qtextoption.h | 3 |
1 files changed, 2 insertions, 1 deletions
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; |