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

27 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
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
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
Christian Kandeler
d6164fa09b Maemo: Fix default label values in device config widget. 2011-02-28 14:16:37 +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
f3edc4f2fd Maemo: Make ports line edit read-only for emulator. 
Changing this field will not have an effect anyway.
 2011-02-09 15:56:53 +01:00
Christian Kandeler
4d4ae95baf Maemo: Nicer process list for non-Fremantle systems. 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
448f754ce9 Maemo: Remove ability to change device type. 
It's a fundamental attribute of the device. It makes no sense to
change it.
 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
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
77baa801f4 Maemo: Add OS type to device configuration. 
Not used anywhere as of now.
 2011-02-02 17:54:22 +01:00
Christian Kandeler
b6e729039a Maemo: Fix permissions of authorized_keys on device. 
On Meego, this file is world-readable by default.
 2011-02-02 17:54:22 +01:00
Christian Kandeler
a8bea59d88 Maemo: Allow user to set default device configuration. 
Task-number: QTCREATORBUG-3486
 2011-01-13 15:03:58 +01:00
Christian Kandeler
164cc4ff2c Maemo: Refactor device configurations list. 2011-01-13 15:03:58 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kandeler
250b190522 Maemo: Configuration dialog fixes. 
- Disable "Remote Processes" button when no entry is selected.
- Fix some keyboard shortcuts.
 2011-01-03 14:57:24 +01:00
Christian Kandeler
e25b69b24c Maemo: Let user set default key file. 
Task-number: QTCREATORBUG-3276
 2010-12-06 15:28:16 +01:00
Christian Kandeler
2b318539d4 Maemo: Fix logic in device configurations dialog. 
Don't do anything when the "emulator" or "hardware" buttons are
clicked and are already checked.
 2010-12-06 14:28:31 +01:00
Friedemann Kleint
35b69d96b5 Compile warning. 2010-12-03 16:49:52 +01:00
Christian Kandeler
527aba641b Maemo: Fix leak. 2010-12-03 15:09:04 +01:00
Christian Kandeler
766e9c1e3b Maemo: Add Qemu settings page. 
Put it in new top-level "Maemo" category, along
with the Maemo device configurations.

Reviewed-by: kh1
 2010-12-03 14:14:04 +01:00