diff options
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qcolor.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qpageranges.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qpainter_p.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qplatformbackingstore.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qtransform.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 65d82c2043..06b264eacf 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -297,7 +297,7 @@ public: // can't give friendship to a namespace, so it needs to be public : cspec(spec), ct(a1, a2, a3, a4, a5) {} #endif // Q_COMPILER_UNIFORM_INIT }; -Q_DECLARE_TYPEINFO(QColor, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QColor, Q_RELOCATABLE_TYPE); inline QColor::QColor(QLatin1String aname) { setNamedColor(aname); } diff --git a/src/gui/painting/qpageranges.h b/src/gui/painting/qpageranges.h index 823d83665b..d525124a62 100644 --- a/src/gui/painting/qpageranges.h +++ b/src/gui/painting/qpageranges.h @@ -116,7 +116,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageRanges &pageRanges); #endif Q_DECLARE_SHARED(QPageRanges) -Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPageRanges::Range, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 29e2aca175..71e90c9717 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -140,7 +140,7 @@ public: }; -Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_RELOCATABLE_TYPE); class Q_GUI_EXPORT QPainterState : public QPaintEngineState { diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp index 1a7c6c5189..bf7dc55644 100644 --- a/src/gui/painting/qplatformbackingstore.cpp +++ b/src/gui/painting/qplatformbackingstore.cpp @@ -80,7 +80,7 @@ struct QBackingstoreTextureInfo QPlatformTextureList::Flags flags; }; -Q_DECLARE_TYPEINFO(QBackingstoreTextureInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QBackingstoreTextureInfo, Q_RELOCATABLE_TYPE); class QPlatformTextureListPrivate : public QObjectPrivate { diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index a84563baea..a1ec8e9399 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -177,7 +177,7 @@ private: mutable uint m_type : 5; mutable uint m_dirty : 5; }; -Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTransform, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(const QTransform &key, size_t seed = 0) noexcept; |