diff options
Diffstat (limited to 'src/libs/qmljs/qmljsbind.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljsbind.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index 54b9a204f2..fd7c7c68cb 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -154,9 +154,9 @@ ObjectValue *Bind::bindObject(UiQualifiedId *qualifiedTypeNameId, UiObjectInitia parentObjectValue = switchObjectValue(objectValue); - if (parentObjectValue) + if (parentObjectValue) { objectValue->setMember(QLatin1String("parent"), parentObjectValue); - else if (!_rootObjectValue) { + } else if (!_rootObjectValue) { _rootObjectValue = objectValue; _rootObjectValue->setClassName(_doc->componentName()); } @@ -201,10 +201,11 @@ bool Bind::visit(UiImport *ast) _diagnosticMessages->append( errorMessage(ast, tr("package import requires a version number"))); } + const QString importId = ast->importId.toString(); ImportInfo import = ImportInfo::moduleImport(toString(ast->importUri), version, - ast->importId.toString(), ast); + importId, ast); if (_doc->language() == Document::QmlLanguage) { - QString importStr = import.name() + ast->importId.toString(); + const QString importStr = import.name() + importId; QmlLanguageBundles langBundles = ModelManagerInterface::instance()->extendedBundles(); QmlBundle qq1 = langBundles.bundleForLanguage(Document::QmlQtQuick1Language); QmlBundle qq2 = langBundles.bundleForLanguage(Document::QmlQtQuick2Language); |