diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-11-06 21:23:24 +0000 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-11-29 11:45:29 +0000 |
| commit | f7ab19955ffde7b0cf9e1dcb66223c515f775926 (patch) | |
| tree | 2317b70070da09d37bff26f1b53c88fd04c07138 /src/gui/text/qtextobject.cpp | |
| parent | 9ac0f47e649e44d98d7978619b605cfdbac13569 (diff) | |
Make a couple of iterators trivially-copyable in Qt 6
Change-Id: I1d1c382fa6214590b3a51d77b18c7df390f2dc70
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
| -rw-r--r-- | src/gui/text/qtextobject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index df7c8b9c71..6552309dcb 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -663,6 +663,8 @@ QTextFrame::iterator::iterator(QTextFrame *frame, int block, int begin, int end) cb = block; } +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + /*! Copy constructor. Constructs a copy of the \a other iterator. */ @@ -689,6 +691,8 @@ QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other) return *this; } +#endif + /*! Returns the current frame pointed to by the iterator, or 0 if the iterator currently points to a block. |