aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2013-12-16 13:21:22 +0100
committerThomas Hartmann <Thomas.Hartmann@digia.com>2014-01-02 13:49:28 +0100
commit2f5bae02b397b94fe60a8c530bf4a3f31247ee4e (patch)
tree891c8c2f5a7d31ef373b67eedec236625ce61298
parent0b14660427ab999d7ae1027ff825851b75431b11 (diff)
QmlProjectManager: Fix support for Files
Change-Id: I7b6931eb193aca446bc7936f003c5a2f5e41c7f6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp
index eac59378a0..9aec5dd2de 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();
}