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 |
|
Mike McQuaid
|
e16f83a81d
|
Update memcheck namespace and use new APIs.
Merge-request: 284
Reviewed-by: hjk <qtc-committer@nokia.com>
|
2011-04-04 14:39:29 +02:00 |
|
Friedemann Kleint
|
9d85374128
|
Valgrind: Fix breakage caused by tr()-fix.
Breakage introduced by 5c3596e935.
|
2011-03-08 12:36:12 +01:00 |
|
Friedemann Kleint
|
5c3596e935
|
L10n: tr()-Fixes.
|
2011-03-07 17:21:17 +01:00 |
|
Milian Wolff
|
d2fcbda7fc
|
assign DEL as shortcut to 'suppress error'
Merge-request: 265
Reviewed-by: hjk <qtc-committer@nokia.com>
|
2011-03-04 16:00:04 +01:00 |
|
Milian Wolff
|
c833c1ec2d
|
fix painting issue that could happen when filter was removed and selected widget is supposed to get hidden
Merge-request: 265
Reviewed-by: hjk <qtc-committer@nokia.com>
|
2011-03-04 16:00:03 +01:00 |
|
Mike McQuaid
|
6ee9d06737
|
Add valgrind memcheck tool plugin.
Merge-request: 260
Reviewed-by: hjk <qtc-committer@nokia.com>
|
2011-03-04 12:33:37 +01:00 |
|