Commit Graph

24 Commits

Author SHA1 Message Date
Christian Kamm
a14ed0793c QmlJS: Update to latest QmlJS parser from Qt 5.
Using qtdeclarative revision c9b7582a2e7ad9fcd03dd999c3b7a16b72803238

Change-Id: I9c942fa04c3fab5ef57b38e13471d0a4e2e8a2bf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-07-31 11:05:03 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Christian Kamm
67dd062a31 QmlJS: Merge new parser from Qt 5.
Change-Id: I986df52b7ddb31e3bae1148eda881acc1829b102
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-07 11:24:59 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Christian Kamm
82cbd0a974 QmlJS: Support .import directives in js files.
* Allow .import...
* Fix parsing of JS files when using Lexer::scanDirectives()
* Clean up ImportInfo construction.
* Rename ImportInfo::id to ImportInfo::as.

Change-Id: I888da248f06dc6184db99aa74c3b50d7f2f5e491
Reviewed-on: http://codereview.qt-project.org/5625
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-28 08:52:56 +02:00
Christian Kamm
25f37732b0 QmlJS: Update parser from Qt5.
Change-Id: I26a5fb6a1eb99a777e4f1e01fb7b19e559c9bce7
Reviewed-on: http://codereview.qt-project.org/5143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-19 14:18:23 +02:00
Christian Kamm
b531209002 QmlJS: Merge parser updates from Qt5.
Change-Id: Ibed38abca8f7e7bae7d424751a18c83f4c9e9bc5
Reviewed-on: http://codereview.qt-project.org/4732
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-14 11:48:11 +02:00
Christian Kamm
b53570d48d QmlJS parser: Fix else token in IfStatement.
Change-Id: Id994a9c5777021e3dc5027776df42234441440d8
Reviewed-on: http://codereview.qt.nokia.com/4319
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-07 09:32:32 +02:00
Christian Kamm
d72bddc7da QmlJS: Update to new QmlJS parser.
UiPublicMember is now initialized with a statement.
2011-05-12 13:39:53 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Erik Verbruggen
d866848ab8 Re-imported and re-generated the QML parser from Qt. 2011-02-21 12:46:02 +01:00
Friedemann Kleint
edb4893547 Header cleanup in src, specify module name. 2011-01-24 12:29:48 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Roberto Raggi
c23721c860 Updated the QML/JS front-end. 2010-10-26 13:50:17 +02:00
Roberto Raggi
fe46a750ed Updated the QML/JS front-end. 2010-03-31 15:40:28 +02:00
Roberto Raggi
0b12111d6e Regenerated the qml/js front-end. 2010-03-29 17:21:05 +02:00
Christian Kamm
0423169bd4 Update Qml parser. 2010-03-25 14:55:44 +01:00
Roberto Raggi
5b9d6614f2 Updated the QML/JS parser. 2010-03-15 15:29:37 +01:00
Roberto Raggi
26e4672bc6 Updated the QML/JS front-end. 2010-03-03 11:39:21 +01:00
Erik Verbruggen
2395ec51a6 Incorporated commit 38c0ed9870fc6bd8ba759c283eaf2bffb61c2e3f from kinetic-declarativeui.
Fixed possible array index-out-of-bounds crash in error reporting.
2010-01-21 16:47:46 +01:00
Erik Verbruggen
205c9b3f9a Moved the qmljs shared folder into the shared library. 2010-01-18 14:12:44 +01:00