diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-29 16:31:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-30 21:15:40 +0200 |
| commit | cc692bb58c8a39f06eb30c04cfcb61fa466d18ae (patch) | |
| tree | 3e32794fa51a2d85356596710b11c8290388b8da /src/gui/text/qtextformat.h | |
| parent | 47ae99a07ab5726e5316d56f0ca3ce958cd85ac5 (diff) | |
Get rid of some #ifdef qt6
None of this code is even compiled in qt6.
Change-Id: I5891cc9459320083ad3908fcbf646f3ba75b8a4d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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 9d422786f0..71ad97a635 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -118,7 +118,7 @@ private: friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTextLength &); friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTextLength &); }; -Q_DECLARE_TYPEINFO(QTextLength, QT_VERSION >= QT_VERSION_CHECK(6,0,0) ? Q_PRIMITIVE_TYPE : Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextLength, Q_PRIMITIVE_TYPE); inline QTextLength::QTextLength(Type atype, qreal avalue) : lengthType(atype), fixedValueOrPercentage(avalue) {} |