Eike Ziller
85cf2b661e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/plugins/debugger/qml/scriptconsole.cpp
src/plugins/git/gitplugin.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h
Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +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
Aurindam Jana
baafc89dfc
Debugger: Fix build break on Windows
...
Removed inclusion of parser.pri from qml.pri and added QML_PARSER_EXPORT
to QmlJSGrammar.
Task-number: QTCREATORBUG-6292
Change-Id: I6a1fb3e038a6c154c4c3b368d7c7e6eda9975698
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
2011-10-13 09:25:42 +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
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
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Roberto Raggi
fe46a750ed
Updated the QML/JS front-end.
2010-03-31 15:40:28 +02: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
Oswald Buddenhagen
d4ac9c9f8e
re-enable QT_USE_FAST_CONCATENATION
...
includes workaround for breakage with old g++
2010-02-08 13:00:57 +01:00
Erik Verbruggen
205c9b3f9a
Moved the qmljs shared folder into the shared library.
2010-01-18 14:12:44 +01:00
