Merge branch '1.3' of scm.dev.nokia.troll.no:creator/mainline into 1.3
No related branches found
No related tags found
Showing
- src/plugins/qmleditor/parser/qmljs.g 85 additions, 45 deletionssrc/plugins/qmleditor/parser/qmljs.g
- src/plugins/qmleditor/parser/qmljsast.cpp 25 additions, 13 deletionssrc/plugins/qmleditor/parser/qmljsast.cpp
- src/plugins/qmleditor/parser/qmljsast_p.h 25 additions, 13 deletionssrc/plugins/qmleditor/parser/qmljsast_p.h
- src/plugins/qmleditor/parser/qmljsastfwd_p.h 25 additions, 13 deletionssrc/plugins/qmleditor/parser/qmljsastfwd_p.h
- src/plugins/qmleditor/parser/qmljsastvisitor.cpp 28 additions, 16 deletionssrc/plugins/qmleditor/parser/qmljsastvisitor.cpp
- src/plugins/qmleditor/parser/qmljsastvisitor_p.h 26 additions, 14 deletionssrc/plugins/qmleditor/parser/qmljsastvisitor_p.h
- src/plugins/qmleditor/parser/qmljsengine_p.cpp 26 additions, 14 deletionssrc/plugins/qmleditor/parser/qmljsengine_p.cpp
- src/plugins/qmleditor/parser/qmljsengine_p.h 26 additions, 14 deletionssrc/plugins/qmleditor/parser/qmljsengine_p.h
- src/plugins/qmleditor/parser/qmljsgrammar.cpp 16 additions, 16 deletionssrc/plugins/qmleditor/parser/qmljsgrammar.cpp
- src/plugins/qmleditor/parser/qmljsgrammar_p.h 16 additions, 16 deletionssrc/plugins/qmleditor/parser/qmljsgrammar_p.h
- src/plugins/qmleditor/parser/qmljslexer.cpp 45 additions, 26 deletionssrc/plugins/qmleditor/parser/qmljslexer.cpp
- src/plugins/qmleditor/parser/qmljslexer_p.h 26 additions, 14 deletionssrc/plugins/qmleditor/parser/qmljslexer_p.h
- src/plugins/qmleditor/parser/qmljsmemorypool_p.h 25 additions, 13 deletionssrc/plugins/qmleditor/parser/qmljsmemorypool_p.h
- src/plugins/qmleditor/parser/qmljsnodepool_p.h 32 additions, 14 deletionssrc/plugins/qmleditor/parser/qmljsnodepool_p.h
- src/plugins/qmleditor/parser/qmljsparser.cpp 31 additions, 18 deletionssrc/plugins/qmleditor/parser/qmljsparser.cpp
- src/plugins/qmleditor/parser/qmljsparser_p.h 25 additions, 13 deletionssrc/plugins/qmleditor/parser/qmljsparser_p.h
Loading
Please register or sign in to comment