diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-20 18:45:43 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-20 18:45:43 (GMT) |
| commit | d63d0c10c0eeef0d2f93f3d0b197e09399087b00 (patch) | |
| tree | 746a1856103d6367f9821a81b7eee25aeb10a7ed /src/gui/text/qtextdocument_p.h | |
| parent | 435c87186ff54ebfd481e41e07b9a136fbc87a20 (diff) | |
| parent | e90a5e819478b656963de0492a1b234c8863a12b (diff) | |
| download | Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.zip Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.tar.gz Qt-d63d0c10c0eeef0d2f93f3d0b197e09399087b00.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Conflicts:
src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
Diffstat (limited to 'src/gui/text/qtextdocument_p.h')
| -rw-r--r-- | src/gui/text/qtextdocument_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index 55aa17e..363309c 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -139,7 +139,9 @@ public: MoveCursor = 1 }; quint16 command; - quint8 block; ///< All undo commands that have this set to true are combined with the preceding command on undo/redo. + uint block_part : 1; // all commands that are part of an undo block (including the first and the last one) have this set to 1 + uint block_end : 1; // the last command in an undo block has this set to 1. + uint block_padding : 6; // padding since block used to be a quint8 quint8 operation; int format; quint32 strPos; |