diff options
Diffstat (limited to 'src/qmldom/qqmldomitem.cpp')
| -rw-r--r-- | src/qmldom/qqmldomitem.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/qmldom/qqmldomitem.cpp b/src/qmldom/qqmldomitem.cpp index 079fa5678e..30ac7091bf 100644 --- a/src/qmldom/qqmldomitem.cpp +++ b/src/qmldom/qqmldomitem.cpp @@ -2279,21 +2279,23 @@ DomItem::DomItem(std::shared_ptr<DomUniverse> universePtr): } void DomItem::loadFile(QString canonicalFilePath, QString logicalPath, QString code, - QDateTime codeDate, DomTop::Callback callback, LoadOptions loadOptions) + QDateTime codeDate, DomTop::Callback callback, LoadOptions loadOptions, + std::optional<DomType> fileType) { DomItem topEl = top(); if (topEl.internalKind() == DomType::DomEnvironment || topEl.internalKind() == DomType::DomUniverse) { if (auto univ = topEl.ownerAs<DomUniverse>()) univ->loadFile(*this, canonicalFilePath, logicalPath, code, codeDate, callback, - loadOptions); + loadOptions, fileType); else if (auto env = topEl.ownerAs<DomEnvironment>()) { if (env->options() & DomEnvironment::Option::NoDependencies) env->loadFile(topEl, canonicalFilePath, logicalPath, code, codeDate, callback, - DomTop::Callback(), DomTop::Callback(), loadOptions); + DomTop::Callback(), DomTop::Callback(), loadOptions, fileType); else env->loadFile(topEl, canonicalFilePath, logicalPath, code, codeDate, - DomTop::Callback(), DomTop::Callback(), callback, loadOptions); + DomTop::Callback(), DomTop::Callback(), callback, loadOptions, + fileType); } else Q_ASSERT(false && "expected either DomUniverse or DomEnvironment cast to succeed"); } else { @@ -2303,7 +2305,7 @@ void DomItem::loadFile(QString canonicalFilePath, QString logicalPath, QString c } void DomItem::loadFile(QString filePath, QString logicalPath, DomTop::Callback callback, - LoadOptions loadOptions) + LoadOptions loadOptions, std::optional<DomType> fileType) { DomItem topEl = top(); if (topEl.internalKind() == DomType::DomEnvironment @@ -2313,10 +2315,10 @@ void DomItem::loadFile(QString filePath, QString logicalPath, DomTop::Callback c else if (auto env = topEl.ownerAs<DomEnvironment>()) { if (env->options() & DomEnvironment::Option::NoDependencies) env->loadFile(topEl, filePath, logicalPath, callback, DomTop::Callback(), - DomTop::Callback(), loadOptions); + DomTop::Callback(), loadOptions, fileType); else env->loadFile(topEl, filePath, logicalPath, DomTop::Callback(), DomTop::Callback(), - callback, loadOptions); + callback, loadOptions, fileType); } else Q_ASSERT(false && "expected either DomUniverse or DomEnvironment cast to succeed"); } else { |