feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix build.

Browse Source 
Change-Id: I230442300bf03d229c0168c108eb69fbd98708af
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-21 08:58:54 +02:00
parent e906bbdb56
commit bbb6a4bb64
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/qmljslink.cpp
View File

@@ -392,7 +392,7 @@ Import LinkPrivate::importNonFile(Document::Ptr doc, const ImportInfo &importInf
ModuleApiInfo moduleApi = findBestModuleApi(importableModuleApis.value(packageName), version);
if (moduleApi.version.isValid()) {
importFound = true;
import.object->setPrototype(valueOwner->cppQmlTypes().objectByCppName(moduleApi.name));
import.object->setPrototype(valueOwner->cppQmlTypes().objectByCppName(moduleApi.cppName));
}
if (!importFound && importInfo.ast()) {
@@ -479,7 +479,7 @@ bool LinkPrivate::importLibrary(Document::Ptr doc,
// if a module api has no uri, it shares the same name
ModuleApiInfo sameUriModuleApi = findBestModuleApi(noUriModuleApis, version);
if (sameUriModuleApi.version.isValid())
import->object->setPrototype(valueOwner->cppQmlTypes().objectByCppName(sameUriModuleApi.name));
import->object->setPrototype(valueOwner->cppQmlTypes().objectByCppName(sameUriModuleApi.cppName));
}
}

2
src/libs/qmljs/qmljstypedescriptionreader.cpp
View File

@@ -247,7 +247,7 @@ void TypeDescriptionReader::readModuleApi(UiObjectDefinition *ast)
} else if (name == "version") {
apiInfo.version = readNumericVersionBinding(script);
} else if (name == "name") {
apiInfo.name = readStringBinding(script);
apiInfo.cppName = readStringBinding(script);
} else {
addWarning(script->firstSourceLocation(),
"Expected only uri, version and name script bindings");