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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
This commit is contained in:
Eike Ziller
2011-11-11 09:46:01 +01:00
parent 920ed1140e d099d6856e
commit 85cf2b661e
3971 changed files with 17179 additions and 13395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
**
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (info@qt.nokia.com)
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
@@ -26,7 +26,7 @@
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at info@qt.nokia.com.
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
@@ -154,7 +154,6 @@ CppComponentValue::CppComponentValue(FakeMetaObject::ConstPtr metaObject, const
const ComponentVersion &importVersion, int metaObjectRevision,
ValueOwner *valueOwner)
: ObjectValue(valueOwner),
_attachedType(0),
_metaObject(metaObject),
_moduleName(packageName),
_componentVersion(componentVersion),
@@ -258,8 +257,13 @@ void CppComponentValue::processMembers(MemberProcessor *processor) const
}
}
if (_attachedType)
_attachedType->processMembers(processor);
// look into attached types
const QString &attachedTypeName = _metaObject->attachedTypeName();
if (!attachedTypeName.isEmpty()) {
const CppComponentValue *attachedType = valueOwner()->cppQmlTypes().objectByCppName(attachedTypeName);
if (attachedType)
attachedType->processMembers(processor);
}
ObjectValue::processMembers(processor);
}
@@ -353,16 +357,6 @@ QList<const CppComponentValue *> CppComponentValue::prototypes() const
return protos;
}
const CppComponentValue *CppComponentValue::attachedType() const
{
return _attachedType;
}
void CppComponentValue::setAttachedType(CppComponentValue *value)
{
_attachedType = value;
}
FakeMetaObject::ConstPtr CppComponentValue::metaObject() const
{
return _metaObject;