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 |
|
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 |
|
hjk
|
29279ab8c7
|
more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
|
2011-11-02 18:20:19 +01:00 |
|
Thomas Murach
|
a4c4d67772
|
corrected license headers
Change-Id: I56fa50745a80abf52488bebe6a5a72cf26932a8b
Merge-request: 352
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1251
|
2011-07-06 17:56:15 +02:00 |
|
con
|
0c1d21fb5b
|
Make "modifies current document" its own property. Add some tool tips.
|
2011-02-18 17:15:39 +01:00 |
|
con
|
10b6b2936b
|
Make the "sort selection" tool do something.
* Handle <input> tag.
* Pass input to running process.
* Search for executable in path.
* Add "CurrentSelection" variable.
Remaining issue: ReplaceSelection output handling.
|
2011-02-18 17:15:36 +01:00 |
|
con
|
6c69638711
|
Separate std out and std err handling.
|
2011-02-18 17:15:36 +01:00 |
|
con
|
371478ffb9
|
Read external tools from resources and show them in menu.
|
2011-02-18 17:15:35 +01:00 |
|
con
|
e07e914514
|
External tools need a uid, e.g. for keyboard shortcuts.
|
2011-02-18 17:15:35 +01:00 |
|
con
|
965ce7abf0
|
Read localized description, name and category from external tools
|
2011-02-18 17:15:34 +01:00 |
|
con
|
740743dc25
|
Implement an external tool container + xml parsing.
|
2011-02-18 17:15:34 +01:00 |
|