From 2f5bae02b397b94fe60a8c530bf4a3f31247ee4e Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Mon, 16 Dec 2013 13:21:22 +0100
Subject: [PATCH] QmlProjectManager: Fix support for Files
Change-Id: I7b6931eb193aca446bc7936f003c5a2f5e41c7f6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
.../fileformat/qmlprojectfileformat.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
index eac59378a0a..9aec5dd2de6 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
@@ -55,6 +55,10 @@ void setupFileFilterItem(QmlProjectManager::FileFilterBaseItem *fileFilterItem,
if (pathsProperty.isValid())
fileFilterItem->setPathsProperty(pathsProperty.toStringList());
+ const QVariant filterProperty = node->property(QLatin1String("filter"));
+ if (filterProperty.isValid())
+ fileFilterItem->setFilter(filterProperty.toString());
+
if (debug)
qDebug() << "directory:" << directoryProperty << "recursive" << recursiveProperty << "paths" << pathsProperty;
}
@@ -117,6 +121,12 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const QString &fileName,
CssFileFilterItem *cssFileFilterItem = new CssFileFilterItem(projectItem);
setupFileFilterItem(cssFileFilterItem, childNode);
projectItem->appendContent(cssFileFilterItem);
+ } else if (childNode->name() == QLatin1String("Files")) {
+ if (debug)
+ qDebug() << "Files";
+ OtherFileFilterItem *otherFileFilterItem = new OtherFileFilterItem(projectItem);
+ setupFileFilterItem(otherFileFilterItem, childNode);
+ projectItem->appendContent(otherFileFilterItem);
} else {
qWarning() << "Unknown type:" << childNode->name();
}
--
GitLab