feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,461 Commits 108 Branches 368 Tags
fae7dc9584b4e2f2192f8b7a71c428fcaa2ddb70
Commit Graph

22 Commits

Author SHA1 Message Date
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
Christian Kandeler
ddd4db6aaa Maemo: Device config improvements. 2011-04-11 11:50:40 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2' 
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
 2011-04-01 09:53:09 +02:00
Christian Kandeler
62e75919e7 Maemo: "Mad Developer" is now called "SDK Connectivity" on Harmattan. 2011-03-31 15:18:12 +02:00
Christian Kandeler
e175559074 Maemo: Make device config wizard create key directory if necessary. 
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=234300
 2011-03-29 10:44:01 +02:00
Christian Kandeler
325424d0d1 Maemo: No automatic test for new Qemu device configuration. 
It is very unlikely that the emulator is already running.
 2011-03-29 08:40:47 +02:00
Christian Kandeler
439b45618e Start making the Maemo support more generic. 
This includes:
    - decoupling deploy configurations from targets (Reviewed-by: dt)
    - adding a "Generic Linux" device type
    - splitting up the Maemo deployment step into small pieces that
      can be combined in different ways (and much more easily maintained)
    - adding a new version handler for pro.user files
      (Reviewed-by: Tobias Hunger)

Also:
  - Add and use an SSH manager class for easier connection sharing.
  - Make the SSH connection parameters a fixed attribute of the connection.
 2011-03-09 13:10:19 +01:00
Christian Kandeler
d24ebfed3d SSH: Fix misnomers. 2011-02-28 17:02:38 +01:00
Friedemann Kleint
88ba702293 L10n: tr()-Fixes for 2.2 2011-02-15 16:05:52 +01:00
Christian Kandeler
22a49fd4a8 SSH: Choose better names for public types and variables. 2011-02-15 13:35:17 +01:00
Christian Kandeler
a5e6450998 Maemo: Rename "Simulator" to "Emulator" when referring to Qemu. 
No user-visible changes.
 2011-02-15 10:35:31 +01:00
Milian Wolff
94548a1e1f move src/plugins/coreplugin/ssh to src/lib/utils/ssh 
Merge-request: 253
Reviewed-by: hjk <qtc-committer@nokia.com>
 2011-02-14 16:34:17 +01:00
Christian Kandeler
1b3f8c57b4 Maemo: Add default value to device config wizard. 
Task-number: QTCREATORBUG-3782
 2011-02-10 15:37:53 +01:00
Christian Kandeler
fafa20f863 Maemo: Remove outdated comments. 2011-02-09 16:20:16 +01:00
Christian Kandeler
aa2ab9492f Maemo: Use rpm for listing packages on Meego devices. 2011-02-04 11:29:54 +01:00
Christian Kandeler
7caf52125e Maemo: Display OS type in device configuration widget. 2011-02-03 17:36:18 +01:00
Christian Kandeler
46b91942e8 Maemo: Replace line edits with path choosers in device config wizard. 2011-02-03 17:36:18 +01:00
Christian Kandeler
c5e00691df Maemo: Use device configuration wizard. 
Needs patch choosers instead of line edits.
 2011-02-03 17:36:17 +01:00
Christian Kandeler
0649657181 Maemo: Continue implementing device configuration wizard. 
Pretty much complete now, but still not used.
 2011-02-03 14:19:09 +01:00
Christian Kandeler
a84106dfd4 Maemo: Introduce dedicated class for key deploying. 
We want to re-use that functionality in our wizard.
 2011-02-03 10:00:36 +01:00
Christian Kandeler
0752ec6cd7 Maemo: Start implementing device configuration wizard. 
Incomplete and not used anywhere yet.
 2011-02-02 17:54:22 +01:00