8 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h
index de484006c5..4255548b0d 100644
--- a/src/corelib/global/qtypeinfo.h
+++ b/src/corelib/global/qtypeinfo.h
@@ -181,6 +181,7 @@ namespace std { \
 QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_SHARED(TYPE)                                          \
+Q_DECLARE_TYPEINFO(TYPE, Q_MOVABLE_TYPE); \
 template <> inline void qSwap<TYPE>(TYPE &value1, TYPE &value2) \
 { value1.swap(value2); } \
 Q_DECLARE_SHARED_STL(TYPE)
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 41db9d711d..6b1f79ab3c 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -150,7 +150,7 @@ private:
     }
 };
 
-Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_SHARED(QFileInfo)
 
 typedef QList<QFileInfo> QFileInfoList;
 
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h
index 90b29ed958..5096d9c1d9 100644
--- a/src/corelib/io/qurl.h
+++ b/src/corelib/io/qurl.h
@@ -329,7 +329,6 @@ public:
     inline DataPtr &data_ptr() { return d; }
 };
 
-Q_DECLARE_TYPEINFO(QUrl, Q_MOVABLE_TYPE);
 Q_DECLARE_SHARED(QUrl)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QUrl::ComponentFormattingOptions)
 //Q_DECLARE_OPERATORS_FOR_FLAGS(QUrl::FormattingOptions)
diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h
index 5939fd938a..5eac44f327 100644
--- a/src/corelib/io/qurlquery.h
+++ b/src/corelib/io/qurlquery.h
@@ -111,7 +111,6 @@ public:
     inline DataPtr &data_ptr() { return d; }
 };
 
-Q_DECLARE_TYPEINFO(QUrlQuery, Q_MOVABLE_TYPE);
 Q_DECLARE_SHARED(QUrlQuery)
 
 #if QT_DEPRECATED_SINCE(5,0)
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index a415b0e3a7..c06a441468 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -576,7 +576,6 @@ inline QT_DEPRECATED bool qVariantCanConvert(const QVariant &variant)
 
 #endif
 Q_DECLARE_SHARED(QVariant)
-Q_DECLARE_TYPEINFO(QVariant, Q_MOVABLE_TYPE);
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant &);
diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h
index 5ccb5c0fd7..403c266941 100644
--- a/src/corelib/tools/qbitarray.h
+++ b/src/corelib/tools/qbitarray.h
@@ -172,7 +172,6 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QBitArray &);
 Q_CORE_EXPORT QDebug operator<<(QDebug, const QBitArray &);
 #endif
 
-Q_DECLARE_TYPEINFO(QBitArray, Q_MOVABLE_TYPE);
 Q_DECLARE_SHARED(QBitArray)
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 82675e00e3..1682db0802 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -606,7 +606,6 @@ inline QByteArray qUncompress(const QByteArray& data)
 { return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); }
 #endif
 
-Q_DECLARE_TYPEINFO(QByteArray, Q_MOVABLE_TYPE);
 Q_DECLARE_SHARED(QByteArray)
 
 QT_END_NAMESPACE
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index f136d74dc9..2edfc04502 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -1161,7 +1161,6 @@ Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QString &);
 Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QString &);
 #endif
 
-Q_DECLARE_TYPEINFO(QString, Q_MOVABLE_TYPE);
 Q_DECLARE_SHARED(QString)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QString::SectionFlags)