diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-13 01:00:43 +0200 |
| commit | 8d8140dffa9aa680a519b501fc5bdf08c91dd735 (patch) | |
| tree | 346d255ca98fd79aaef9db84eac724a49285da1c /src/gui/text/qtextformat.h | |
| parent | e55a79b022e542a482177c2f34140c23b100b708 (diff) | |
| parent | a90899df4330afccd8299fa81754f369e6d12344 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9953c1ca16862184c2373027e946c482ce8e6f0e
Diffstat (limited to 'src/gui/text/qtextformat.h')
| -rw-r--r-- | src/gui/text/qtextformat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 12f14a1555..28da0fe344 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -627,7 +627,7 @@ public: LineDistanceHeight = 4 }; - enum MarkerType { + enum class MarkerType { NoMarker = 0, Unchecked = 1, Checked = 2 |