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 |
|
Friedemann Kleint
|
58111b2df2
|
API Documentation: Add VCSBase.
|
2011-03-28 14:19:17 +02:00 |
|
con
|
d1023c7614
|
It's 2011 now.
Reviewed-by: hjk
|
2011-01-12 09:46:24 +01:00 |
|
con
|
04e32b0049
|
License headers.
|
2010-12-17 16:03:42 +01:00 |
|
Jarek Kobus
|
20c0817a3f
|
Replace QWizard with Utils::Wizard
|
2010-03-31 15:22:14 +02:00 |
|
hjk
|
9595504bda
|
Long live the king!
|
2010-03-05 11:28:13 +01:00 |
|
Oswald Buddenhagen
|
a6ca348636
|
remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
|
2010-01-29 21:33:57 +01:00 |
|
Friedemann Kleint
|
ecf48086de
|
Checkout wizard: Hangs on Windows when VCS binary is missing.
due to StartFailed being emitted from start(). Set state correctly,
improve error reporting.
Reviewed-by: con <qtc-commiter@nokia.com>
|
2009-10-30 17:40:33 +01:00 |
|
hjk
|
93cbef8724
|
long live the king
|
2009-08-14 09:30:56 +02:00 |
|
Friedemann Kleint
|
9f14b79cc6
|
Add a clone wizard for version control (base classes + git/svn).
Task-number: 244831
|
2009-07-17 17:19:23 +02:00 |
|