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

QmlDesigner: Ensure that QQuickItem is always used from the QtQuick export

Browse Source 
The code model creates multiple exports for QQuickItem, but to be able to
identify it as QtQuick.Item we have to always use the QtQuick export.

Change-Id: Ife567cfb368092f818c7cf418ede4ab1bca227fa
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2016-01-07 12:55:39 +01:00
parent 895550844d
commit b7eafe9512
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View File

@@ -751,6 +751,21 @@ const CppComponentValue *NodeMetaInfoPrivate::getCppComponentValue() const
// maybe 'type' is a cpp name // maybe 'type' is a cpp name
const CppComponentValue *cppValue = context()->valueOwner()->cppQmlTypes().objectByCppName(type); const CppComponentValue *cppValue = context()->valueOwner()->cppQmlTypes().objectByCppName(type);
if (cppValue) {
foreach (const LanguageUtils::FakeMetaObject::Export &exportValue, cppValue->metaObject()->exports()) {
if (exportValue.package.toUtf8() != "<cpp>") {
foreach (const QmlJS::Import &import, context()->imports(document())->all()) {
if (import.info.path() != exportValue.package)
continue;
const Value *lookupResult = import.object->lookupMember(exportValue.type, context());
const CppComponentValue *cppValue = value_cast<CppComponentValue>(lookupResult);
if (cppValue)
return cppValue;
}
}
}
}
return cppValue; return cppValue;
} }