aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypeloader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
-rw-r--r--src/qml/qml/qqmltypeloader.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 228f2f96b6..f76ded631c 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1509,8 +1509,7 @@ const QQmlDirParser *QQmlTypeLoader::qmlDirParser(const QString &filePath,
if (file.isError()) {
ERROR(NOT_READABLE_ERROR.arg(filePath));
} else {
- qmldirParser->setSource(QString::fromUtf8(file.data(), file.size()));
- qmldirParser->parse();
+ qmldirParser->parse(QString::fromUtf8(file.data(), file.size()));
}
} else {
@@ -1533,13 +1532,11 @@ const QQmlDirParser *QQmlTypeLoader::qmlDirParser(const QString &filePath,
if (file.isError()) {
ERROR(NOT_READABLE_ERROR.arg(filePath));
} else {
- qmldirParser->setSource(QString::fromUtf8(file.data(), file.size()));
- qmldirParser->parse();
+ qmldirParser->parse(QString::fromUtf8(file.data(), file.size()));
}
} else {
data += file.readAll();
- qmldirParser->setSource(QString::fromUtf8(data));
- qmldirParser->parse();
+ qmldirParser->parse(QString::fromUtf8(data));
}
} else {
ERROR(NOT_READABLE_ERROR.arg(filePath));
@@ -2158,8 +2155,7 @@ const QQmlDirComponents &QQmlQmldirData::dirComponents() const
void QQmlQmldirData::dataReceived(const Data &data)
{
QQmlDirParser parser;
- parser.setSource(QString::fromUtf8(data.data(), data.size()));
- parser.parse();
+ parser.parse(QString::fromUtf8(data.data(), data.size()));
m_components = parser.components();
}