summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1317-19/+19
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2917-435/+435
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0117-39/+39
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1117-19/+19
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1317-307/+307
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-1/+1
|\ | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * fix typo in error messagesOswald Buddenhagen2011-01-171-1/+1
| | | | | | | | Task-number: QTBUG-16369
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1717-19/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1017-19/+19
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-272-4/+4
|\ \ | |/
| * Set the location of the closing brace.Roberto Raggi2010-10-262-4/+4
| | | | | | | | Reviewed-by: Christian Kamm
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-6/+9
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Fix position of synthesized semicolon tokens.Aaron Kennedy2010-10-201-6/+9
| | | | | | | | | | Authored-by: Roberto Raggi Reviewed-by: Aaron Kennedy
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-146/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Remove unused AST node destructors.Michael Brasser2010-09-281-146/+3
| | | | | | | | | | | | NodePool does a block free on the memory, so the (empty) destructors are never called, and add lots of noise to code coverage analysis. Added a note in the source about the block freeing.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-4/+4
| | | | | | | | Reviewed-by: Roberto Raggi
| * Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
* | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-031-6/+0
|/ | | | | | | The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310. Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Reuse QML lexer to simplify .pragma script logicAaron Kennedy2010-07-221-5/+5
|
* Allow to build Qt in static with mingwThierry Bastian2010-06-071-1/+1
| | | | | | | | | | Some functions were marked with Q_DECL_IMPORT where they should just be Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport). That leads the linker to try to import it and it shouldn't. Task-number: QTBUG-10791 Reviewed-by: gabi
* Fix parsing of regular expression literals.Roberto Raggi2010-04-211-29/+79
| | | | | | | Recognize regular expression classes and escape sequences. Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-183-5/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Recognize identifiers containing unicode escape sequences. Fix README Fix doc: QML_DECLARE_TYPE is no longer necessary Fix doc: remote contents requires qmldir Fixed parsing of inner labelled statements. Doc Remove unsupported plugin version flags in .pro files of declarative examples Documentation typo. More QML doc consistency. Ensure existing image is gone before next photo selection. Don't use zoomfactor. Doc: in QML use "real" and "enumeration", not "qreal" and "enum" Doc: Put "default" property label on same line as property name Wait for debug clients asynchronously instead of blocking creation of Test not reliable ResizeMode support for QGraphicsWidgets created with QDeclarativeView More class documentation fixes for declarative. Simplify QML import plugin deployment lines Add QML imports to s60installs.pro Cleanup photoviewer demo. ...
| * Recognize identifiers containing unicode escape sequences.Roberto Raggi2010-04-161-1/+41
| | | | | | | | | | Task-number: QTBUG-8108 Reviewed-by: Olivier Goffart
| * Fixed parsing of inner labelled statements.Roberto Raggi2010-04-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JS grammar is ambigious and the following statement can be parsed as an object-literal followed by an inserted semicolon or as two labelled statements. outer: { inner: {} } In the old days we used to resolve the conflict by reducing the statement to an expression statement but this was wrong so now we prefer the labelled statement. As nice side effect, we pass two more tests in tests/auto/declarative/parserstress. Task-number: QTBUG-8108
* | Further RVCT4 fixes for SymbianIain2010-04-161-1/+1
|/ | | | | | | More corrections to declarations to ensure symbol visibility is correct Task-number: QTBUG-9998 Reviewed-by: TrustMe
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-0215-40/+40
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Fixed: Declared properties cannot be assigned in declarationRoberto Raggi2010-03-317-1034/+1130
| | | | Task-number: QTBUG-7860
* Removed unneeded code.Roberto Raggi2010-03-292-10/+0
|
* Recompute the source location of regexp literals.Roberto Raggi2010-03-262-2/+14
| | | | Task-number: QTBUG-9367
* Manual merge.Warwick Allison2010-03-222-2/+6
|
* Compile with user defined Qt namespaceRoberto Raggi2010-03-151-2/+4
| | | | Protect the forward declaration of qstrtod with a QT_BEGIN/END namespace
* Fix grammar stringifying "on" as "readonly"Aaron Kennedy2010-03-044-5/+5
| | | | QTBUG-8676
* Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
|
* Introduced alternative syntax for defining QML bindings.Roberto Raggi2010-02-257-1000/+1072
| | | | | | | | | | | | | | | Now it is possible to define bindings using the `on' context keyword. For example, you can write Behavior on opacity { NumberAnimation { duration: 500 } } instead of opacity: Behavior { NumberAnimation { duration: 500 } }
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-2418-386/+386
| | | | QDeclarativeXXX.
* Fix copyright year.Jason McDonald2010-02-1614-14/+14
| | | | Reviewed-by: Trust Me
* Changed define name to reflect change in Creator.Erik Verbruggen2010-02-081-2/+2
|
* re-enable QT_USE_FAST_CONCATENATIONErik Verbruggen2010-02-081-1/+1
| | | | includes workaround for breakage with old g++
* Fixed possible array index-out-of-bounds crash in error reporting.Erik Verbruggen2010-01-212-2/+12
|
* Added utility method to parse JavaScript programs.Erik Verbruggen2010-01-187-1110/+1060
| | | | Reviewed-by: Christian Kamm
* Added a utility method to get a casted AST root node.Erik Verbruggen2010-01-184-0/+29
| | | | Reviewed-by: Christian Kamm
* Fixed the parser to start with the correct rule when requested to parse JS ↵Erik Verbruggen2010-01-183-634/+672
| | | | Source Elements.
* Fixed missing export in generated parser.Erik Verbruggen2010-01-152-2/+2
|
* Re-generated grammar and fixed license headers.Erik Verbruggen2010-01-154-1098/+1092
|
* Fixed license headers.Erik Verbruggen2010-01-151-66/+44
|
* Added utility method to parse single/stand-alone JS source elements.Erik Verbruggen2010-01-151-1/+12
|
* oops, fix the compilationThierry Bastian2009-12-041-1/+1
|