forked from qt-creator/qt-creator
		
	QmlDesigner.Model: Fixes order problem
The order of allModelNode function was not in order.
This commit is contained in:
		@@ -390,6 +390,7 @@ void NodeInstanceView::instancePropertyChange(const QList<QPair<ModelNode, QStri
 | 
			
		||||
 | 
			
		||||
//\}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void NodeInstanceView::loadNodes(const QList<ModelNode> &nodeList)
 | 
			
		||||
{
 | 
			
		||||
    foreach (const ModelNode &node, nodeList)
 | 
			
		||||
@@ -405,8 +406,11 @@ void NodeInstanceView::loadNodes(const QList<ModelNode> &nodeList)
 | 
			
		||||
            instanceForNode(node).setPropertyBinding(property.name(), property.expression());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    foreach(NodeInstance instance, m_objectInstanceHash.values())
 | 
			
		||||
        instance.doComponentComplete();
 | 
			
		||||
    QListIterator<ModelNode> listIterator(nodeList);
 | 
			
		||||
    listIterator.toBack();
 | 
			
		||||
 | 
			
		||||
    while (listIterator.hasPrevious())
 | 
			
		||||
        instanceForNode(listIterator.previous()).doComponentComplete();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// TODO: Set base state as current model state
 | 
			
		||||
 
 | 
			
		||||
@@ -1218,7 +1218,18 @@ bool ModelPrivate::hasId(const QString &id) const
 | 
			
		||||
 | 
			
		||||
QList<InternalNodePointer> ModelPrivate::allNodes() const
 | 
			
		||||
{
 | 
			
		||||
    return m_nodeSet.toList();
 | 
			
		||||
    // the item must be ordered!
 | 
			
		||||
 | 
			
		||||
    QList<InternalNodePointer> nodeList;
 | 
			
		||||
 | 
			
		||||
    if (m_rootInternalNode.isNull() || !m_rootInternalNode->isValid())
 | 
			
		||||
        return nodeList;
 | 
			
		||||
 | 
			
		||||
    nodeList.append(m_rootInternalNode);
 | 
			
		||||
    nodeList.append(m_rootInternalNode->allSubNodes());
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    return nodeList;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool ModelPrivate::isWriteLocked() const
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user