Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Eike Ziller
2013-12-09 12:41:09 +01:00
16 changed files with 41 additions and 15 deletions

View File

@@ -118,7 +118,7 @@ QmlProjectItem *QmlProjectFileFormat::parseProjectFile(const QString &fileName,
setupFileFilterItem(cssFileFilterItem, childNode);
projectItem->appendContent(cssFileFilterItem);
} else {
qWarning() << "Unkwown type:" << childNode->name();
qWarning() << "Unknown type:" << childNode->name();
}
}
return projectItem;