Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/libs/utils/filesearch.cpp 2 additions, 3 deletionssrc/libs/utils/filesearch.cpp
- src/plugins/duieditor/parser/qmljs.g 188 additions, 17 deletionssrc/plugins/duieditor/parser/qmljs.g
- src/plugins/duieditor/parser/qmljsast.cpp 2 additions, 2 deletionssrc/plugins/duieditor/parser/qmljsast.cpp
- src/plugins/duieditor/parser/qmljsast_p.h 53 additions, 6 deletionssrc/plugins/duieditor/parser/qmljsast_p.h
- src/plugins/duieditor/parser/qmljsastfwd_p.h 2 additions, 2 deletionssrc/plugins/duieditor/parser/qmljsastfwd_p.h
- src/plugins/duieditor/parser/qmljsastvisitor.cpp 2 additions, 2 deletionssrc/plugins/duieditor/parser/qmljsastvisitor.cpp
- src/plugins/duieditor/parser/qmljsastvisitor_p.h 2 additions, 2 deletionssrc/plugins/duieditor/parser/qmljsastvisitor_p.h
- src/plugins/duieditor/parser/qmljsengine_p.cpp 26 additions, 14 deletionssrc/plugins/duieditor/parser/qmljsengine_p.cpp
- src/plugins/duieditor/parser/qmljsengine_p.h 37 additions, 14 deletionssrc/plugins/duieditor/parser/qmljsengine_p.h
- src/plugins/duieditor/parser/qmljsgrammar.cpp 759 additions, 699 deletionssrc/plugins/duieditor/parser/qmljsgrammar.cpp
- src/plugins/duieditor/parser/qmljsgrammar_p.h 16 additions, 12 deletionssrc/plugins/duieditor/parser/qmljsgrammar_p.h
- src/plugins/duieditor/parser/qmljslexer.cpp 5 additions, 3 deletionssrc/plugins/duieditor/parser/qmljslexer.cpp
- src/plugins/duieditor/parser/qmljslexer_p.h 2 additions, 2 deletionssrc/plugins/duieditor/parser/qmljslexer_p.h
- src/plugins/duieditor/parser/qmljsmemorypool_p.h 3 additions, 3 deletionssrc/plugins/duieditor/parser/qmljsmemorypool_p.h
- src/plugins/duieditor/parser/qmljsnodepool_p.h 3 additions, 3 deletionssrc/plugins/duieditor/parser/qmljsnodepool_p.h
- src/plugins/duieditor/parser/qmljsparser.cpp 348 additions, 249 deletionssrc/plugins/duieditor/parser/qmljsparser.cpp
- src/plugins/duieditor/parser/qmljsparser_p.h 30 additions, 8 deletionssrc/plugins/duieditor/parser/qmljsparser_p.h
- src/plugins/duieditor/parser/qmljsprettypretty.cpp 103 additions, 103 deletionssrc/plugins/duieditor/parser/qmljsprettypretty.cpp
- src/plugins/duieditor/parser/qmljsprettypretty_p.h 3 additions, 3 deletionssrc/plugins/duieditor/parser/qmljsprettypretty_p.h
- src/plugins/find/basetextfind.cpp 2 additions, 1 deletionsrc/plugins/find/basetextfind.cpp
Loading
Please register or sign in to comment