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 |
|
Christian Kamm
|
b5a92a1957
|
Json: Use the javascript editor for json files.
Task-number: QTCREATORBUG-4639
Change-Id: Icd0fda434d5ca66056d784dd87240db76e8a442c
Reviewed-on: http://codereview.qt-project.org/6035
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
|
2011-10-12 11:34:36 +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 |
|
con
|
23c22b7c66
|
License headers, part 2
|
2010-12-17 17:14:20 +01:00 |
|
Tobias Hunger
|
e85bfa7073
|
Windows: Fix some warnings
|
2010-11-15 17:51:54 +01:00 |
|
Christian Kamm
|
8d59cff401
|
QmlJS: Add wizard for creating new js files.
Task-number: QTCREATORBUG-3070
|
2010-11-15 14:03:16 +01:00 |
|