diff options
Diffstat (limited to 'src/corelib/text')
-rw-r--r-- | src/corelib/text/qchar.h | 2 | ||||
-rw-r--r-- | src/corelib/text/qlocale_p.h | 2 | ||||
-rw-r--r-- | src/corelib/text/qstring.cpp | 2 | ||||
-rw-r--r-- | src/corelib/text/qstring.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/text/qchar.h b/src/corelib/text/qchar.h index 32ecfa0e48..78d95e39fa 100644 --- a/src/corelib/text/qchar.h +++ b/src/corelib/text/qchar.h @@ -638,7 +638,7 @@ private: char16_t ucs; }; -Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QChar, Q_RELOCATABLE_TYPE); #ifndef QT_NO_DATASTREAM Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QChar); diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index 69b6136313..4bad1c698e 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -135,7 +135,7 @@ private: friend class QSystemLocaleSingleton; }; Q_DECLARE_TYPEINFO(QSystemLocale::QueryType, Q_PRIMITIVE_TYPE); -Q_DECLARE_TYPEINFO(QSystemLocale::CurrencyToStringArgument, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QSystemLocale::CurrencyToStringArgument, Q_RELOCATABLE_TYPE); #endif #if QT_CONFIG(icu) diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index c63da7f1d1..76f0e15303 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -4456,7 +4456,7 @@ public: qsizetype length; QStringView string; }; -Q_DECLARE_TYPEINFO(qt_section_chunk, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(qt_section_chunk, Q_RELOCATABLE_TYPE); static QString extractSections(const QList<qt_section_chunk> §ions, qsizetype start, qsizetype end, QString::SectionFlags flags) diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index fa4eeb0367..843ee9966e 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -311,7 +311,7 @@ private: qsizetype m_size; const char *m_data; }; -Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QLatin1String, Q_RELOCATABLE_TYPE); // Qt 4.x compatibility |