diff options
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qgridlayoutengine_p.h | 2 | ||||
-rw-r--r-- | src/gui/util/qshaderformat_p.h | 2 | ||||
-rw-r--r-- | src/gui/util/qshadergenerator_p.h | 2 | ||||
-rw-r--r-- | src/gui/util/qshadergraph_p.h | 6 | ||||
-rw-r--r-- | src/gui/util/qshadergraphloader_p.h | 2 | ||||
-rw-r--r-- | src/gui/util/qshadernode_p.h | 4 | ||||
-rw-r--r-- | src/gui/util/qshadernodeport_p.h | 2 | ||||
-rw-r--r-- | src/gui/util/qshadernodesloader_p.h | 2 | ||||
-rw-r--r-- | src/gui/util/qtexturefiledata_p.h | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index 17b65b6220..341d159fb1 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -214,7 +214,7 @@ public: } } }; -Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_MOVABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0 +Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_RELOCATABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0 bool operator==(const QGridLayoutBox &box1, const QGridLayoutBox &box2); inline bool operator!=(const QGridLayoutBox &box1, const QGridLayoutBox &box2) diff --git a/src/gui/util/qshaderformat_p.h b/src/gui/util/qshaderformat_p.h index 3559c67414..e47fbb8a03 100644 --- a/src/gui/util/qshaderformat_p.h +++ b/src/gui/util/qshaderformat_p.h @@ -114,7 +114,7 @@ inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexc return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderFormat, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderFormat, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadergenerator_p.h b/src/gui/util/qshadergenerator_p.h index 1f6f9d2532..4d3a09c92f 100644 --- a/src/gui/util/qshadergenerator_p.h +++ b/src/gui/util/qshadergenerator_p.h @@ -70,7 +70,7 @@ public: QShaderFormat format; }; -Q_DECLARE_TYPEINFO(QShaderGenerator, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGenerator, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadergraph_p.h b/src/gui/util/qshadergraph_p.h index 41ad22cedb..dbc5f3fab7 100644 --- a/src/gui/util/qshadergraph_p.h +++ b/src/gui/util/qshadergraph_p.h @@ -111,9 +111,9 @@ inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::S return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderGraph, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QShaderGraph::Edge, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QShaderGraph::Statement, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraph, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraph::Edge, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraph::Statement, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadergraphloader_p.h b/src/gui/util/qshadergraphloader_p.h index e7aa19fa2d..bdd02799f7 100644 --- a/src/gui/util/qshadergraphloader_p.h +++ b/src/gui/util/qshadergraphloader_p.h @@ -89,7 +89,7 @@ private: QShaderGraph m_graph; }; -Q_DECLARE_TYPEINFO(QShaderGraphLoader, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderGraphLoader, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadernode_p.h b/src/gui/util/qshadernode_p.h index 15382fe0b4..303a404165 100644 --- a/src/gui/util/qshadernode_p.h +++ b/src/gui/util/qshadernode_p.h @@ -117,8 +117,8 @@ inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rh return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderNode, Q_MOVABLE_TYPE); -Q_DECLARE_TYPEINFO(QShaderNode::Rule, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNode, Q_RELOCATABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNode::Rule, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadernodeport_p.h b/src/gui/util/qshadernodeport_p.h index c69ba23a3f..e4e11f6826 100644 --- a/src/gui/util/qshadernodeport_p.h +++ b/src/gui/util/qshadernodeport_p.h @@ -79,7 +79,7 @@ inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) n return !(lhs == rhs); } -Q_DECLARE_TYPEINFO(QShaderNodePort, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNodePort, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qshadernodesloader_p.h b/src/gui/util/qshadernodesloader_p.h index 432d7d4494..8afdd294ca 100644 --- a/src/gui/util/qshadernodesloader_p.h +++ b/src/gui/util/qshadernodesloader_p.h @@ -86,7 +86,7 @@ private: QHash<QString, QShaderNode> m_nodes; }; -Q_DECLARE_TYPEINFO(QShaderNodesLoader, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QShaderNodesLoader, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/gui/util/qtexturefiledata_p.h b/src/gui/util/qtexturefiledata_p.h index 2df23de33c..fb732cd84c 100644 --- a/src/gui/util/qtexturefiledata_p.h +++ b/src/gui/util/qtexturefiledata_p.h @@ -106,7 +106,7 @@ private: QSharedDataPointer<QTextureFileDataPrivate> d; }; -Q_DECLARE_TYPEINFO(QTextureFileData, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextureFileData, Q_RELOCATABLE_TYPE); Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QTextureFileData &d); |