summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsscanner.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-1/+1
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QmlJS: Fix uses of Scanner::state().Christian Kamm2011-06-031-6/+4
| | | | | | | Change-Id: I5195fc43e8a6653bf52c0eaa6cddb8dfd25b6217 Reviewed-on: http://codereview.qt.nokia.com/319 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Compile fixFriedemann Kleint2011-05-231-4/+4
| | | | | | Change-Id: I8f3eb7d21074fec00de870d33e493842286222ee Reviewed-on: http://codereview.qt.nokia.com/51 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* QmlJS: Make the Scanner recognize regular expression literals.Christian Kamm2011-05-231-8/+91
| | | | | | | Task-number: QTCREATORBUG-4566 Change-Id: I48b08f8eee79b25d0ebe186b996cdcb8f1979e3d Reviewed-on: http://codereview.qt.nokia.com/38 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Update license.hjk2011-04-131-14/+13
|
* Header cleanup in src, specify module name.Friedemann Kleint2011-01-241-1/+1
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* Merge branch '2.1'con2010-12-171-7/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-171-7/+11
| |
* | Fix syntax highlighting of multiline QMLJS stringsRhys Weatherley2010-11-291-1/+23
|/
* QmlJS: Adjust scanner to treat ++ and -- as a single delimiter token.Christian Kamm2010-08-101-0/+10
| | | | Reviewed-by: Roberto Raggi
* Qml scanner: Don't emit token for empty line in multi-line comment.Christian Kamm2010-07-081-1/+1
| | | | Done-with: Thomas Hartmann
* Qml scanner: Fix begin location of comment tokens in multiline comments.Christian Kamm2010-07-081-1/+5
| | | | | Done-with: Thomas Hartmann Reviewed-by: Roberto Raggi
* QmlJS: Allow folding of multi-line comments.Christian Kamm2010-05-271-6/+1
| | | | | | | This also makes the editor auto-fold the license comment. Task-number: QTCREATORBUG-1455 Reviewed-by: Erik Verbruggen
* QmlJSEditor: Add completion for JS keywords and Qml reserved words.Christian Kamm2010-03-261-0/+10
| | | | | Task-number: QTCREATORBUG-919 Reviewed-by: Roberto Raggi
* Long live the king!hjk2010-03-051-1/+1
|
* Get rid of the QmlJS prefix.Roberto Raggi2010-02-151-7/+7
|
* Introduced QmlJSScanner::scanComments/setScanComments(onoff).Roberto Raggi2010-01-291-10/+24
|
* Fixed highlihing of QML context keywords.Roberto Raggi2010-01-291-1/+52
|
* Skip white spaces.Roberto Raggi2010-01-291-1/+5
|
* Say hello to the new incremental scanner for QML/JS.Roberto Raggi2010-01-281-285/+164
|
* Moved QmlJSScanner::Token in the QmlJS namespace.Roberto Raggi2010-01-191-1/+1
|
* Renamed classes and files to use the QmlJS prefix.Roberto Raggi2010-01-181-0/+363
View Lorry Controller Status