diff options
Diffstat (limited to 'src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp')
| -rw-r--r-- | src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp index 2102147c29a..febf016785c 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.cpp @@ -37,7 +37,7 @@ enum { namespace { -void setupFileFilterItem(QmlProjectManager::FileFilterBaseItem *fileFilterItem, const QmlJS::SimpleReaderNode::Ptr &node) +QmlProjectManager::FileFilterBaseItem *setupFileFilterItem(QmlProjectManager::FileFilterBaseItem *fileFilterItem, const QmlJS::SimpleReaderNode::Ptr &node) { const QVariant directoryProperty = node->property(QLatin1String("directory")); if (directoryProperty.isValid()) @@ -57,6 +57,7 @@ void setupFileFilterItem(QmlProjectManager::FileFilterBaseItem *fileFilterItem, if (debug) qDebug() << "directory:" << directoryProperty << "recursive" << recursiveProperty << "paths" << pathsProperty; + return fileFilterItem; } } //namespace @@ -100,37 +101,19 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const Utils::FilePath &fi qDebug() << "importPath:" << importPathsProperty << "mainFile:" << mainFileProperty; foreach (const QmlJS::SimpleReaderNode::Ptr &childNode, rootNode->children()) { + if (debug) + qDebug() << "reading type:" << childNode->name(); + if (childNode->name() == QLatin1String("QmlFiles")) { - if (debug) - qDebug() << "QmlFiles"; - auto qmlFileFilterItem = new QmlFileFilterItem(projectItem); - setupFileFilterItem(qmlFileFilterItem, childNode); - projectItem->appendContent(qmlFileFilterItem); + projectItem->appendContent(setupFileFilterItem(new FileFilterItem("*.qml"), childNode)); } else if (childNode->name() == QLatin1String("JavaScriptFiles")) { - if (debug) - qDebug() << "JavaScriptFiles"; - auto jsFileFilterItem = new JsFileFilterItem(projectItem); - setupFileFilterItem(jsFileFilterItem, childNode); - projectItem->appendContent(jsFileFilterItem); + projectItem->appendContent(setupFileFilterItem(new FileFilterItem("*.js"), childNode)); } else if (childNode->name() == QLatin1String("ImageFiles")) { - if (debug) - qDebug() << "ImageFiles"; - auto imageFileFilterItem = new ImageFileFilterItem(projectItem); - setupFileFilterItem(imageFileFilterItem, childNode); - projectItem->appendContent(imageFileFilterItem); - + projectItem->appendContent(setupFileFilterItem(new ImageFileFilterItem(projectItem), childNode)); } else if (childNode->name() == QLatin1String("CssFiles")) { - if (debug) - qDebug() << "CssFiles"; - auto cssFileFilterItem = new CssFileFilterItem(projectItem); - setupFileFilterItem(cssFileFilterItem, childNode); - projectItem->appendContent(cssFileFilterItem); + projectItem->appendContent(setupFileFilterItem(new FileFilterItem("*.css"), childNode)); } else if (childNode->name() == QLatin1String("Files")) { - if (debug) - qDebug() << "Files"; - auto otherFileFilterItem = new OtherFileFilterItem(projectItem); - setupFileFilterItem(otherFileFilterItem, childNode); - projectItem->appendContent(otherFileFilterItem); + projectItem->appendContent(setupFileFilterItem(new FileFilterBaseItem(), childNode)); } else if (childNode->name() == "Environment") { const auto properties = childNode->properties(); auto i = properties.constBegin(); |