summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/generic/tuiotouch/qoscbundle_p.h2
-rw-r--r--src/plugins/generic/tuiotouch/qoscmessage_p.h2
-rw-r--r--src/plugins/generic/tuiotouch/qtuiocursor_p.h2
-rw-r--r--src/plugins/generic/tuiotouch/qtuiotoken_p.h2
-rw-r--r--src/plugins/platforminputcontexts/ibus/qibustypes.h8
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h2
-rw-r--r--src/plugins/platforms/xcb/qxcbdrag.h2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/generic/tuiotouch/qoscbundle_p.h b/src/plugins/generic/tuiotouch/qoscbundle_p.h
index 5aee310017..66f93f4964 100644
--- a/src/plugins/generic/tuiotouch/qoscbundle_p.h
+++ b/src/plugins/generic/tuiotouch/qoscbundle_p.h
@@ -68,7 +68,7 @@ private:
QList<QOscBundle> m_bundles;
QList<QOscMessage> m_messages;
};
-Q_DECLARE_TYPEINFO(QOscBundle, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QOscBundle, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/plugins/generic/tuiotouch/qoscmessage_p.h b/src/plugins/generic/tuiotouch/qoscmessage_p.h
index f8738c4242..97660c4b5e 100644
--- a/src/plugins/generic/tuiotouch/qoscmessage_p.h
+++ b/src/plugins/generic/tuiotouch/qoscmessage_p.h
@@ -65,7 +65,7 @@ private:
QByteArray m_addressPattern;
QVariantList m_arguments;
};
-Q_DECLARE_TYPEINFO(QOscMessage, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QOscMessage, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/plugins/generic/tuiotouch/qtuiocursor_p.h b/src/plugins/generic/tuiotouch/qtuiocursor_p.h
index b8301bcf2c..504e514d14 100644
--- a/src/plugins/generic/tuiotouch/qtuiocursor_p.h
+++ b/src/plugins/generic/tuiotouch/qtuiocursor_p.h
@@ -102,7 +102,7 @@ private:
float m_acceleration;
QEventPoint::State m_state;
};
-Q_DECLARE_TYPEINFO(QTuioCursor, Q_MOVABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible, m_state is = 1, not 0.
+Q_DECLARE_TYPEINFO(QTuioCursor, Q_RELOCATABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible, m_state is = 1, not 0.
QT_END_NAMESPACE
diff --git a/src/plugins/generic/tuiotouch/qtuiotoken_p.h b/src/plugins/generic/tuiotouch/qtuiotoken_p.h
index 0c72436c4c..f449748a58 100644
--- a/src/plugins/generic/tuiotouch/qtuiotoken_p.h
+++ b/src/plugins/generic/tuiotouch/qtuiotoken_p.h
@@ -138,7 +138,7 @@ private:
float m_angularAcceleration;
QEventPoint::State m_state;
};
-Q_DECLARE_TYPEINFO(QTuioToken, Q_MOVABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible: m_id, m_classId == -1
+Q_DECLARE_TYPEINFO(QTuioToken, Q_RELOCATABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible: m_id, m_classId == -1
QT_END_NAMESPACE
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h
index e6bff1ef81..ef2dcc341a 100644
--- a/src/plugins/platforminputcontexts/ibus/qibustypes.h
+++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h
@@ -92,7 +92,7 @@ public:
quint32 start;
quint32 end;
};
-Q_DECLARE_TYPEINFO(QIBusAttribute, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusAttribute, Q_RELOCATABLE_TYPE);
class QIBusAttributeList : private QIBusSerializable
{
@@ -106,7 +106,7 @@ public:
QList<QIBusAttribute> attributes;
};
-Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_RELOCATABLE_TYPE);
class QIBusText : private QIBusSerializable
{
@@ -119,7 +119,7 @@ public:
QString text;
QIBusAttributeList attributes;
};
-Q_DECLARE_TYPEINFO(QIBusText, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusText, Q_RELOCATABLE_TYPE);
class QIBusEngineDesc : private QIBusSerializable
{
@@ -147,7 +147,7 @@ public:
QString textdomain;
QString iconpropkey;
};
-Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_RELOCATABLE_TYPE);
inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute)
{ attribute.serializeTo(argument); return argument; }
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 77a9c9d934..67caf7d827 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -388,7 +388,7 @@ private:
};
#if QT_CONFIG(tabletevent)
Q_DECLARE_TYPEINFO(QXcbConnection::TabletData::ValuatorClassInfo, Q_PRIMITIVE_TYPE);
-Q_DECLARE_TYPEINFO(QXcbConnection::TabletData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXcbConnection::TabletData, Q_RELOCATABLE_TYPE);
#endif
class QXcbConnectionGrabber
diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h
index 257e82f049..0e17bdfc07 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.h
+++ b/src/plugins/platforms/xcb/qxcbdrag.h
@@ -191,7 +191,7 @@ private:
int findTransactionByTime(xcb_timestamp_t timestamp);
xcb_window_t findRealWindow(const QPoint & pos, xcb_window_t w, int md, bool ignoreNonXdndAwareWindows);
};
-Q_DECLARE_TYPEINFO(QXcbDrag::Transaction, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QXcbDrag::Transaction, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE