From 57485805057eda17008d14ca618e9c1f69a5a35d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 24 Jul 2012 17:57:36 +0200 Subject: [PATCH] Work around Q_DECLARE_METATYPE(QFileInfo) being added to QtCore Change-Id: Ic83e5fdaa7ef289f40cbeb4633a75d93d38c0bdb Reviewed-by: Stephen Kelly --- tools/qmlscene/main.cpp | 2 ++ 1 file changed, 2 insertions(+) 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); -- 2.7.4