From: Marc Mutz <marc.mutz@kdab.com>
Date: Tue, 24 Jul 2012 15:57:36 +0000 (+0200)
Subject: Work around Q_DECLARE_METATYPE(QFileInfo) being added to QtCore
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=57485805057eda17008d14ca618e9c1f69a5a35d;p=konrad%2Fqtdeclarative.git

Work around Q_DECLARE_METATYPE(QFileInfo) being added to QtCore

Change-Id: Ic83e5fdaa7ef289f40cbeb4633a75d93d38c0bdb
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
---

diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 058f9cd..3ab7de3 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -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);