Work around Q_DECLARE_METATYPE(QFileInfo) being added to QtCore
authorMarc Mutz <marc.mutz@kdab.com>
Tue, 24 Jul 2012 15:57:36 +0000 (17:57 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 25 Jul 2012 09:32:06 +0000 (11:32 +0200)
Change-Id: Ic83e5fdaa7ef289f40cbeb4633a75d93d38c0bdb
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
tools/qmlscene/main.cpp

index 058f9cd..3ab7de3 100644 (file)
@@ -171,7 +171,9 @@ struct Options
 };
 
 #if defined(QMLSCENE_BUNDLE)
+#ifndef QT_QFILEINFO_METATYPE_DEFINED
 Q_DECLARE_METATYPE(QFileInfo);
+#endif
 QFileInfoList findQmlFiles(const QString &dirName)
 {
     QDir dir(dirName);