Oswald Buddenhagen
dc3c156cac
Merge branch '2.2'
...
Conflicts:
src/plugins/debugger/gdb/pythongdbengine.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
src/plugins/qt4projectmanager/qt4target.cpp
src/plugins/qt4projectmanager/qt4target.h
src/plugins/qt4projectmanager/qtoptionspage.h
src/plugins/qt4projectmanager/qtversionmanager.cpp
src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964
Update license.
2011-04-13 11:49:28 +02:00
hjk
82f3e788f6
debugger: re-work DisassemblerLine structure
2011-04-12 17:33:08 +02:00
dt
4f278cbfed
Merge remote branch 'origin/2.2'
...
Conflicts:
src/plugins/debugger/disassembleragent.cpp
2011-03-21 17:48:19 +01:00
hjk
a18d0572bd
texteditor: simplify basetextmark architecture
...
ITextMark is not abstract anymore and has an icon and a priority.
This means separate breakpoint and location marker classes that
are only "plain" marks with icons and priorities are not needed.
BaseTextMark directly inherits from ITextMark, instead of owning
an ITextMark derived InternalMark.
Also, there is now ITextMark::paint() to make it a bit more flexible
then icon()[->paint()]
2011-03-21 17:15:02 +01:00
hjk
7198b1ea8b
debugger: fix vanishing location mark in disassembler mode
...
Task-number: QTCREATORBUG-4157
2011-03-18 18:34:02 +01:00
hjk
1b1896b38b
texteditor: give priorities to mark to ensure z-order when drawing
2011-03-02 18:43:26 +01:00
Friedemann Kleint
88f333267f
Fix Krazy code scanning tool warnings (QString, loops, spelling).
2011-02-25 15:28:01 +01:00
hjk
f576ad9f2c
texteditor: merge ITextEditable into ITextEditor
...
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
2011-02-22 11:23:53 +01:00
hjk
7a2fc35629
debugger: fix breakpoint markers in disassembler view
...
Task-number: QTCREATORBUG-3667
2011-02-02 17:28:58 +01:00
Friedemann Kleint
725182916f
Debugger: Add to API documentation.
...
Reviewed-by: hjk
2011-01-26 17:22:25 +01:00
con
d1023c7614
It's 2011 now.
...
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Friedemann Kleint
a7eccce733
Debugger: Header cleanup
2011-01-10 10:14:23 +01:00
con
23c22b7c66
License headers, part 2
2010-12-17 17:14:20 +01:00
hjk
9757e22113
debugger: introduce the concept of a 'Location', used by gotoLocation
2010-12-17 11:59:01 +01:00
hjk
fb837b5230
debugger: s/*ViewAgent/*Agent/ to reduce noise and match file names
2010-12-14 13:10:07 +01:00
hjk
cfd2dbb395
debugger: split debuggeragents.{h,cpp} int {memory,disassembler}agent.{h,cpp}
2010-12-08 16:48:35 +01:00
