summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/parser/qmljs.g
Commit message (Collapse)AuthorAgeFilesLines
* License updateEike Ziller2014-10-091-21/+24
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-3/+3
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmljs: use new qml parserFawzi Mohamed2013-11-061-65/+153
| | | | | | | | adds support for singleton and getter/setter properties Change-Id: Ia6691ac7799a46885db0df44617617dcc3c13189 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlJS: Fix grammar fileTobias Hunger2013-08-091-1/+1
| | | | | | | | Do not reintroduce clang warnings when regenerating code from the grammar file. Change-Id: Ic065191b93e68d88792fedac9784e4fbeff08d6f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-3/+3
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | qmljs/parser: update to latest qt5 parserFawzi Mohamed2013-01-241-32/+63
| | | | | | | | | | | | | | | | fix error semicolon insertion of loops, strict mode Change-Id: Ic67d6b1fff6f476ea7eb64ae0ee43515d29654a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Revert "qmljs/parser: update to latest qt5 parser"Fawzi Mohamed2013-01-231-63/+32
| | | | | | | | | | | | | | | | | | error 'QmlJS::Engine' does not have any field named 'directives to be fixed This reverts commit 7d76f9040a933981ed44b2b4f0a6edcff034be6a Change-Id: I24dbe6829ed3920af0f53f2ec31eba82ebdf749f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | qmljs/parser: update to latest qt5 parserFawzi Mohamed2013-01-231-32/+63
|/ | | | | | fix error semicolon insertion of loops, strict mode Change-Id: I311733ffb34269d1cee7e576d05af78893b2bcbb Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* QmlJS: Fix rewriter for signal parametersThomas Hartmann2012-10-081-6/+8
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-7931 I had to fix a bug in the QmlJsParser. The source location for the propertyTypeToken was not initialized in all cases. I also updated qmljs.g. Change-Id: Idd0880f70578867cf5f97666aede654e00cfc744 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Adjust license headershjk2012-10-051-63/+62
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* QmlJS: Update to latest QmlJS parser from Qt 5.Christian Kamm2012-07-311-9/+11
| | | | | | | Using qtdeclarative revision c9b7582a2e7ad9fcd03dd999c3b7a16b72803238 Change-Id: I9c942fa04c3fab5ef57b38e13471d0a4e2e8a2bf Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-9/+3
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Long live the king!hjk2012-01-261-3/+3
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlJS: Merge new parser from Qt 5.Christian Kamm2011-12-071-4/+9
| | | | | Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-6/+6
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlJS: Update parser from Qt5.Christian Kamm2011-09-191-10/+2
| | | | | | Change-Id: I26a5fb6a1eb99a777e4f1e01fb7b19e559c9bce7 Reviewed-on: http://codereview.qt-project.org/5143 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* QmlJS: Merge parser updates from Qt5.Christian Kamm2011-09-141-340/+221
| | | | | | Change-Id: Ibed38abca8f7e7bae7d424751a18c83f4c9e9bc5 Reviewed-on: http://codereview.qt-project.org/4732 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* QmlJS parser: Fix else token in IfStatement.Christian Kamm2011-09-071-1/+1
| | | | | | Change-Id: Id994a9c5777021e3dc5027776df42234441440d8 Reviewed-on: http://codereview.qt.nokia.com/4319 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* QmlJS: Update to new QmlJS parser.Christian Kamm2011-05-121-25/+15
| | | | UiPublicMember is now initialized with a statement.
* Fix/add copyright headersTobias Hunger2011-05-061-3/+3
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-68/+58
|
* Re-imported and re-generated the QML parser from Qt.Erik Verbruggen2011-02-211-1/+1
|
* s:// end of namespace :// namespace :g for consistencyhjk2011-02-041-1/+1
| | | | We use the latter style everywhere else to signify the end of a namespace block.
* It's 2011 now.con2011-01-121-3/+3
| | | | Reviewed-by: hjk
* Updated the QML/JS front-end.Roberto Raggi2010-10-261-2/+2
|
* Updated the QML/JS front-end.Roberto Raggi2010-10-191-1/+1
| | | | Reviewed-by: Christian Kamm
* Updated the QML/JS front-end.Roberto Raggi2010-03-311-0/+50
|
* Regenerated the qml/js front-end.Roberto Raggi2010-03-291-18/+42
|
* Incorporated commit 38c0ed9870fc6bd8ba759c283eaf2bffb61c2e3f from ↵Erik Verbruggen2010-01-211-1/+6
| | | | | | kinetic-declarativeui. Fixed possible array index-out-of-bounds crash in error reporting.
* Moved the qmljs shared folder into the shared library.Erik Verbruggen2010-01-181-0/+3070
View Lorry Controller Status