feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
12,975 Commits 108 Branches 368 Tags
c2da3f682e34c921eef18352cc4f5bae797f421d
Commit Graph

24 Commits

Author SHA1 Message Date
qt-info@nokia.com
61e7b56fcf Maemo: Implement GUI for per-device port specification. 
Currently hidden.
 2010-08-12 19:25:15 +02:00
hjk
afcc0f7bf1 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
 2010-08-12 11:07:08 +02:00
Joerg Bornemann
1c095f88d0 maemo device configuration was not saved on MacOS 
The code relies on getting the dialog accepted after the editFinished
singnals. This does not work on MacOS.

Reviewed-by: ck
 2010-08-10 14:15:56 +02:00
ck
dd6966b2f0 Maemo: Do the bind() for remote mounts on the device. 
This makes us more independent of the developer PC's firewall setting.

Reviewed-by: kh1
 2010-08-02 12:50:01 +02:00
ck
62e33d0e7a Maemo: Allow SSH password to be displayed to the user. 
Task-number: QTCREATORBUG-1961
Reviewed-by: kh1
 2010-07-28 16:13:34 +02:00
ck
65eb1d5515 Replace SSH library. 2010-07-12 09:33:22 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
 2010-06-18 16:54:37 +02:00
ck
5120a83ee9 Maemo: Fix access rights for remote .ssh directory. 
Task-number: QTCREATORBUG-1673
 2010-06-18 12:48:52 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
ck
cd7c2ca12c Maemo: Fix config name change getting lost in settings widget. 2010-05-14 08:48:27 +02:00
ck
9ece8a4110 Move SSH functionality out of the Qt4ProjectManager. 
It does not conceptually belong there, and several people have
asked for an interface to use the functionality in their own
plugins.

Task-number: QTCREATORBUG-1204
Reviewed-by: kh1
 2010-04-26 11:43:25 +02:00
Daniel Molkentin
d864bfa124 Maemo settings: Turn timeout field into a spinbox. 
Also, the hint on milliseconds was wrong. The unit is seconds.
As requested by Friedemann.
 2010-04-19 14:41:23 +02:00
ck
0a9087eeca Maemo: Allow more than one SSH key on the device. 
Reviewed-by: kh1
 2010-04-19 10:07:55 +02:00
kh1
c57e2eaff4 Implement ssh key generation dialog. 
Reviewed-by: ck
 2010-04-16 12:12:23 +02:00
ck
cfc07ceacf Maemo: Add filter to key file dialog. 
Task-number: QTCREATORBUG-1067
 2010-04-13 10:05:32 +02:00
kh1
fac5b92194 Make the maemo settings widget searchable. 
Reviewed-by: ck
 2010-04-12 14:48:07 +02:00
Daniel Molkentin
11993d190b Change the behavior of the Maemo settings widget 
- Remove ListView by ComboBox. Uses less space
- Ports are now spinboxes, to allow for better input validation
 2010-04-09 15:27:18 +02:00
ck
499c3c8362 Maemo: Deal sensibly with device type changes in settings page. 
Task-number: QTCREATORBUG-1074
Reviewed-by: kh1
 2010-04-08 17:33:57 +02:00
Thorbjørn Lindeijer
f1c9b1ca5e Moved the testing of a Maemo device configuration into a dialog 
Reduces the minimum size of the Options dialog.

Reviewed-by: kh1
 2010-03-19 14:01:58 +01:00
Friedemann Kleint
c0a68f53c3 Tr()-fixes. 2010-02-26 14:20:17 +01:00
ck
1fa20b3838 Maemo: Removed ifdefs for old ssh approach. 2010-02-08 17:52:56 +01:00
ck
535b9691b1 Maemo: Small settings fixes and improvements. 
Reviewed-by: kh1
 2010-02-03 17:25:54 +01:00
ck
e2eb01cc5a Maemo: Move settings widget to its own files. 
Reviewed-by: kh1
 2010-02-03 16:05:51 +01:00