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
dt
e851ce2d1d
Settings dialog: fix flashing of widget
...
Reviewed-By: con
Reviewed-By: Robert Loehning
2011-04-07 14:50:24 +02:00
Friedemann Kleint
0e89104b45
API Documentation: Fix warnings.
2011-03-28 14:58:12 +02:00
hjk
bd35f599f9
debugger: code cosmetics, fix warnings
2011-03-22 10:24:33 +01:00
dt
4f278cbfed
Merge remote branch 'origin/2.2'
...
Conflicts:
src/plugins/debugger/disassembleragent.cpp
2011-03-21 17:48:19 +01:00
Friedemann Kleint
8ff480881a
Debugger: Always add Qt install source mappings for gdb.
...
As it fails for MinGW.
Task-number: QTCREATORBUG-4132
Reviewed-by: hjk
2011-03-18 10:03:08 +01:00
hjk
2a9e8af48c
debugger: code cosmetics
2011-03-17 13:40:02 +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
