diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 6b1f79ab3c..bccecd695e 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -45,6 +45,7 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
+#include <QtCore/qmetatype.h>
 
 QT_BEGIN_HEADER
 
@@ -156,6 +157,9 @@ typedef QList<QFileInfo> QFileInfoList;
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QFileInfo)
+#define QT_QFILEINFO_METATYPE_DEFINED
+
 QT_END_HEADER
 
 #endif // QFILEINFO_H
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index ff92adb5e6..d4dede2889 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -1937,7 +1937,7 @@ void QFileSystemModelPrivate::_q_resolvedName(const QString &fileName, const QSt
 void QFileSystemModelPrivate::init()
 {
     Q_Q(QFileSystemModel);
-    qRegisterMetaType<QList<QPair<QString,QFileInfo> > >("QList<QPair<QString,QFileInfo> >");
+    qRegisterMetaType<QList<QPair<QString,QFileInfo> > >();
     q->connect(&fileInfoGatherer, SIGNAL(newListOfFiles(QString,QStringList)),
                q, SLOT(_q_directoryChanged(QString,QStringList)));
     q->connect(&fileInfoGatherer, SIGNAL(updates(QString,QList<QPair<QString,QFileInfo> >)),
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
index f01b3679b4..d3dd29fa38 100644
--- a/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
@@ -130,7 +130,6 @@ void tst_QFileIconProvider::iconType()
     QVERIFY(!provider.icon(type).isNull());
 }
 
-Q_DECLARE_METATYPE(QFileInfo)
 void tst_QFileIconProvider::iconInfo_data()
 {
     QTest::addColumn<QFileInfo>("info");