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

Compile on windows

Browse Source 
Apparently, it did not like ::label
This commit is contained in:
Olivier Goffart
2010-08-19 12:51:04 +02:00
parent 812af85d38
commit 4dadefc858
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/qmljs/qmljsdelta.cpp
View File

@@ -120,18 +120,18 @@ struct FindObjectMemberWithLabel : public Visitor
virtual void endVisit(UiObjectBinding *ast) ; virtual void endVisit(UiObjectBinding *ast) ;
QList<UiObjectMember *> found; QList<UiObjectMember *> found;
QString label; QString ref_label;
Document::Ptr doc; Document::Ptr doc;
}; };
void FindObjectMemberWithLabel::endVisit(UiObjectDefinition* ast) void FindObjectMemberWithLabel::endVisit(UiObjectDefinition* ast)
{ {
if (::label(ast, doc) == label) if (label(ast, doc) == ref_label)
found.append(ast); found.append(ast);
} }
void FindObjectMemberWithLabel::endVisit(UiObjectBinding* ast) void FindObjectMemberWithLabel::endVisit(UiObjectBinding* ast)
{ {
if (::label(ast, doc) == label) if (label(ast, doc) == ref_label)
found.append(ast); found.append(ast);
} }
@@ -232,7 +232,7 @@ static Map buildMapping(Document::Ptr doc1, Document::Ptr doc2)
//If this is too slow, we could use some sort of indexing //If this is too slow, we could use some sort of indexing
FindObjectMemberWithLabel v3; FindObjectMemberWithLabel v3;
v3.label = label(x, doc1); v3.ref_label = label(x, doc1);
v3.doc = doc2; v3.doc = doc2;
doc2->qmlProgram()->accept(&v3); doc2->qmlProgram()->accept(&v3);
Map M2; Map M2;