Changeset 846 for trunk/src/script/parser
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
-
. (modified) (1 prop)
-
src/script/parser/make-parser.sh (modified) (1 diff)
-
src/script/parser/qscript.g (modified) (3 diffs)
-
src/script/parser/qscriptast.cpp (modified) (1 diff)
-
src/script/parser/qscriptast_p.h (modified) (1 diff)
-
src/script/parser/qscriptastfwd_p.h (modified) (1 diff)
-
src/script/parser/qscriptastvisitor.cpp (modified) (1 diff)
-
src/script/parser/qscriptastvisitor_p.h (modified) (1 diff)
-
src/script/parser/qscriptgrammar.cpp (modified) (1 diff)
-
src/script/parser/qscriptgrammar_p.h (modified) (1 diff)
-
src/script/parser/qscriptlexer.cpp (modified) (2 diffs)
-
src/script/parser/qscriptlexer_p.h (modified) (1 diff)
-
src/script/parser/qscriptparser.cpp (modified) (1 diff)
-
src/script/parser/qscriptparser_p.h (modified) (1 diff)
-
src/script/parser/qscriptsyntaxchecker.cpp (modified) (1 diff)
-
src/script/parser/qscriptsyntaxchecker_p.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/script/parser/make-parser.sh
r651 r846 2 2 ############################################################################# 3 3 ## 4 ## Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).4 ## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 5 5 ## All rights reserved. 6 6 ## Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscript.g
r651 r846 1 1 ---------------------------------------------------------------------------- 2 2 -- 3 -- Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 -- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 -- All rights reserved. 5 5 -- Contact: Nokia Corporation (qt-info@nokia.com) … … 63 63 /./**************************************************************************** 64 64 ** 65 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).65 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 66 66 ** All rights reserved. 67 67 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 120 120 /:/**************************************************************************** 121 121 ** 122 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).122 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 123 123 ** All rights reserved. 124 124 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptast.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptast_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptastfwd_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptastvisitor.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptastvisitor_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptgrammar.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptgrammar_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptlexer.cpp
r769 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 32 32 QT_BEGIN_NAMESPACE 33 33 34 Q_ DECL_IMPORT externdouble qstrtod(const char *s00, char const **se, bool *ok);34 Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); 35 35 36 36 #define shiftWindowsLineBreak() \ -
trunk/src/script/parser/qscriptlexer_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptparser.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptparser_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptsyntaxchecker.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) -
trunk/src/script/parser/qscriptsyntaxchecker_p.h
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com)
Note:
See TracChangeset
for help on using the changeset viewer.
