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

QmlJS: Fix completion of 'anchors.'.

Browse Source 
The hasChildInPackage function was broken, so we completed 'anchors:'
instead.

Task-number: QTCREATORBUG-5180
Change-Id: I0e0d68aec3cf4e5bea991e39169beecf541ce477
Reviewed-on: http://codereview.qt.nokia.com/643
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
This commit is contained in:
Christian Kamm
2011-06-22 17:18:06 +02:00
parent 756e00b15f
commit 0f254adcc3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -446,18 +446,18 @@ QStringList QmlObjectValue::keysForEnum(const QString &enumName) const
// has this one in its prototype chain and is itself in a package.
bool QmlObjectValue::hasChildInPackage() const
{
if (!packageName().isEmpty())
if (!packageName().isEmpty()
&& packageName() != CppQmlTypes::cppPackage)
return true;
QHashIterator<QString, QmlObjectValue *> it(engine()->cppQmlTypes().types());
while (it.hasNext()) {
it.next();
FakeMetaObject::ConstPtr other = it.value()->_metaObject;
// if it has only the default no-package export, it is not really exported
if (other->exports().size() <= 1)
FakeMetaObject::ConstPtr otherMeta = it.value()->_metaObject;
// if it has only a cpp-package export, it is not really exported
if (otherMeta->exports().size() <= 1)
continue;
for (const QmlObjectValue *it = this; it; it = it->prototype()) {
FakeMetaObject::ConstPtr iter = it->_metaObject;
if (iter == _metaObject) // this object is a parent of other
for (const QmlObjectValue *other = it.value(); other; other = other->prototype()) {
if (other->metaObject() == _metaObject) // this object is a parent of other
return true;
}
}