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
82f5573626
more Id type fixes
...
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283
x
Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com >
2011-11-10 15:57:09 +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
488330255d
core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
...
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com >
Reviewed-by: hjk <qthjk@ovi.com >
2011-09-05 18:04:55 +02:00
hjk
df2858bb6c
core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManager
...
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com >
2011-09-05 15:28:46 +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
Friedemann Kleint
a9a5e3ea17
Exported header cleanup.
2011-01-20 14:03:07 +01:00
Tobias Hunger
f74fdcf5fd
Macros: Fix license headers
2010-12-20 11:16:55 +01:00
Nicolas Arnaud-Cormos
f5fbbbfd4f
New plugin: plugin macro
...
This plugin let the user record and replay some macros:
* 3 handlers: action, find and texteditor
* almost all texteditor and cpp actions recorded
* options page to set the directories where the macros are stored
* optional dialog to give a name and comment at the end of a macro
* locator integration to play a macro
* shortcuts assignment to macro
The most important change outside the plugin macros is the isScriptable method
for command: All scriptable commands can be stored in a macro.
Merge-request: 2176
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com >
2010-12-20 11:16:15 +01:00
