feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
10,856 Commits 108 Branches 368 Tags
57f2b3e44da5ca818d575b2c5861f736aa3db0bc
Commit Graph

233 Commits

Author SHA1 Message Date
hjk
5805788290 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
 2010-05-27 11:11:53 +02:00
ck
fd212978ac Maemo: Fix trailing garbage output at end of remote process. 
Task-number: QTCREATORBUG-1461 (part 2)
Written-by: Denis Mingulov
 2010-05-26 12:12:58 +02:00
ck
fae7a9fae7 Maemo: Add missing initialization. 
Task-number: QTCREATORBUG-1461 (part 1)

Conflicts:

	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
 2010-05-26 12:12:41 +02:00
ck
5a6de0ad5e Maemo: Fix trailing garbage output at end of remote process. 
Task-number: QTCREATORBUG-1461 (part 2)
Written-by: Denis Mingulov
 2010-05-25 16:08:52 +02:00
ck
10ac946825 Maemo: Add missing initialization. 
Task-number: QTCREATORBUG-1461 (part 1)
 2010-05-25 15:27:42 +02:00
kh1
745345e347 There is no dependency, so make the runtime manager an real singelton. 
Reviewed-by: ck
 2010-05-25 14:55:53 +02:00
con
d66d188f51 Build fix. 
Reviewed-by: kh
 2010-05-21 16:24:38 +02:00
con
e327467a03 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
 2010-05-21 16:04:27 +02:00
ck
986d5472e6 Compile fix. 2010-05-21 09:12:52 +02:00
ck
e6480735f4 Maemo: Compile fix. 2010-05-21 09:11:19 +02:00
kh1
01b7e7b99d Remove some leftovers. 
Reviewed-by: ck
 2010-05-20 16:46:11 +02:00
ck
c6ef899659 SSH: Add isConnected(), allow redundant calls to start(). 2010-05-20 16:08:08 +02:00
kh1
c6fef3ef63 Long overdue changes and refactoring for qemu handling. 
Fixes: - react on build/ run configuration changes
       - now notices environment changes, like switching Qt versions
       - start button is now only shown if we have a valid qemu runtime
       - enabled/ disabled state works properly when loading a project

Task-number: QTCREATOR-210, QTCREATORBUG-1252, QTCREATORBUG-1082
Reviewed-by: ck
 2010-05-20 16:05:23 +02:00
kh1
9109380570 Long overdue changes and refactoring for qemu handling. 
Fixes: - react on build/ run configuration changes
       - now notices environment changes, like switching Qt versions
       - start button is now only shown if we have a valid qemu runtime
       - enabled/ disabled state works properly when loading a project

Task-number: QTCREATOR-210, QTCREATORBUG-1252, QTCREATORBUG-1082
Reviewed-by: ck
 2010-05-20 15:59:29 +02:00
con
7f4cbe2383 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
 2010-05-20 09:28:00 +02:00
ck
552a072832 Maemo: Fix corner case in end-of-remote-process detection. 2010-05-20 08:54:54 +02:00
ck
7948147410 Maemo: Better error handling for packaging commands. 2010-05-19 15:59:27 +02:00
ck
56d0e4f317 Maemo: Fix package creation step's toMap() function. 2010-05-19 14:12:13 +02:00
ck
c734a81885 Maemo: Make remote path field editable in package widget. 
Reviewed-by: kh1
 2010-05-19 14:12:13 +02:00
ck
2be1f9c61b Maemo: Preparation for deploying executable to arbitrary location. 
Reviewed-by: kh1
 2010-05-19 14:12:13 +02:00
ck
3867325522 Maemo: Serialize package contents. 
Reviewed-by: kh1
 2010-05-19 14:12:13 +02:00
ck
b367cffa8c Maemo: Make package contents user-editable. 
Reviewed-by: kh1
 2010-05-19 14:12:13 +02:00
ck
2277a82f4d Maemo: Set DISPLAY variable before running remote executable. 2010-05-19 14:12:12 +02:00
ck
60991499dd Maemo: Give more information to user about Qemu state. 
Reviewed-by: kh1
 2010-05-19 11:55:00 +02:00
ck
de7bc1d9cf Maemo: Give more information to user about Qemu state. 
Reviewed-by: kh1
 2010-05-19 11:00:43 +02:00
kh1
a9645059ee We need to keep the action around, not the command. 
Fixes broken enabled/ disabled qemu start button behavior.
 2010-05-19 10:49:07 +02:00
kh1
39bd73ff87 We need to keep the action around, not the command. 
Fixes broken enabled/ disabled qemu start button behavior.
 2010-05-18 15:38:50 +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
ba3b881ffc Maemo: Set DISPLAY variable before running remote executable. 2010-05-12 17:21:38 +02:00
ck
64d65fb698 Maemo: Fix corner case in end-of-remote-process detection. 2010-05-12 16:46:08 +02:00
ck
f678fce3a6 SSH: Make interface more Qt-ish. 2010-05-10 11:02:26 +02:00
ck
ef7c5fae60 Debugger: Support running GDB over SSH. 
Reviewed-by: hjk
 2010-05-05 12:51:21 +02:00
ck
26e9569a6c Maemo: Deduce correct target file name for library template. 2010-05-05 09:14:11 +02:00
ck
08f522d93c Maemo: Fix package creation step's toMap() function. 2010-05-04 17:22:26 +02:00
ck
df07adcd41 Maemo: Make remote path field editable in package widget. 
Reviewed-by: kh1
 2010-05-04 11:39:47 +02:00
ck
b61e656493 Maemo: Preparation for deploying executable to arbitrary location. 
Reviewed-by: kh1
 2010-05-03 16:56:38 +02:00
ck
54560de48f Maemo: Serialize package contents. 
Reviewed-by: kh1
 2010-05-03 15:50:40 +02:00
ck
7140288c40 Maemo: Make package contents user-editable. 
Reviewed-by: kh1
 2010-05-03 15:50:40 +02:00
dt
f4ea0d79b9 Add a runMode method to the RunControl 
And use it to implement changing the run icon in the application output.
That implementation does only support the two run modes run and debug
for now. Further abstraction for more run modes to be done once needed.

Task-Nr:   QTCREATORBUG-1232
 2010-05-03 11:25:09 +02:00
kh1
2c64aa0571 Force the action to be really disabled. 2010-04-28 15:07:05 +02:00
Friedemann Kleint
3ea8e3e0d1 i18n: tr()-Fixes. 2010-04-27 11:12:47 +02:00
ck
e112c6a9bf Maemo: Add simple widget for package configuration. 2010-04-26 14:12:45 +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
ck
08b719c992 Maemo: Remove debug output that annoyed someone. 2010-04-23 10:32:15 +02:00
kh1
3907104169 Fix build break after rebase. 2010-04-22 17:34:35 +02:00
kh1
f13d2b4bf8 Fix warning. 2010-04-22 17:32:40 +02:00
Kai Koehne
4047e0456b Fix gcc compiler warnings 2010-04-22 15:36:42 +02:00
ck
83f505d96a Maemo: Add model for future package contents view. 
No functional changes for now.

Reviewed-by: kh1
 2010-04-20 17:15:53 +02:00