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
dec9622cfa
debugger: make "debugger font size follows main editor optional"
...
Task-number: QTCREATORBUG-2420
2011-04-01 12:03:11 +02:00
hjk
82b7e9befd
debugger: persist 'AlwaysAdjust*ColumnWidths' settings
...
Task-number: QTCREATORBUG-2836
2011-03-16 18:49:01 +01:00
Friedemann Kleint
3e77509384
Debugger: Fix QTC_ASSERT in options page finish().
2011-03-07 11:05:03 +01:00
Friedemann Kleint
2d9de93361
Debugger: Add a flexible widget for source path substitutions.
...
Add a new widget to edit the mappings. Rework common options
page to use the standard pattern to allow for complex data types,
introduce GlobalOptions class.
2011-03-04 16:24:54 +01:00
Friedemann Kleint
fcd4c9e194
L10n: tr()-Fixes.
2011-03-02 12:01:34 +01:00
Friedemann Kleint
ad21b4859a
L10n: tr()-Fixes.
2011-03-01 17:07:37 +01:00
hjk
9cae0553b8
debugger: also save the new qt source location settings
2011-02-23 18:00:42 +01:00
hjk
3331aea7da
debugger: make qt source path configurable
2011-02-23 17:56:21 +01:00
Friedemann Kleint
6ac7efba15
Debugger: Move debugger executables configuration into toolchains.
2011-02-23 14:57:52 +01:00
hjk
431d83465a
debugger: fix adding a debugger for a toolchain
2011-02-22 18:13:34 +01:00
hjk
d652c21181
debugger: compile fix
2011-02-22 13:29:00 +01:00
hjk
bd44fb1248
debugger: move gdb binary list to common options page (unfinished)
2011-02-22 12:59:12 +01:00
