diff options
Diffstat (limited to 'src/qml/compiler/qv4compilerscanfunctions.cpp')
| -rw-r--r-- | src/qml/compiler/qv4compilerscanfunctions.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4compilerscanfunctions.cpp b/src/qml/compiler/qv4compilerscanfunctions.cpp index f47643826f..6ca46fd362 100644 --- a/src/qml/compiler/qv4compilerscanfunctions.cpp +++ b/src/qml/compiler/qv4compilerscanfunctions.cpp @@ -164,8 +164,11 @@ void ScanFunctions::endVisit(ESModule *) bool ScanFunctions::visit(ExportDeclaration *declaration) { QString module; - if (declaration->fromClause) + if (declaration->fromClause) { module = declaration->fromClause->moduleSpecifier.toString(); + if (!module.isEmpty()) + _context->moduleRequests << module; + } if (declaration->exportAll) { Compiler::ExportEntry entry; @@ -233,8 +236,14 @@ bool ScanFunctions::visit(ExportDeclaration *declaration) bool ScanFunctions::visit(ImportDeclaration *declaration) { QString module; - if (declaration->fromClause) + if (declaration->fromClause) { module = declaration->fromClause->moduleSpecifier.toString(); + if (!module.isEmpty()) + _context->moduleRequests << module; + } + + if (!declaration->moduleSpecifier.isEmpty()) + _context->moduleRequests << declaration->moduleSpecifier.toString(); if (ImportClause *import = declaration->importClause) { if (!import->importedDefaultBinding.isEmpty()) { |