Commit Graph

57 Commits

Author SHA1 Message Date
ck
f43095ceaf Maemo: Prepare infrastructure for proper subdirs support.
No difference in functionality yet.

Reviewed-by: kh1
2010-07-06 12:06:03 +02:00
Friedemann Kleint
4c655cdd90 ProjectExplorer: Fully qualify signals of run control.
To be able to connect to them in the debugger namespace.
Reviewed-by: dt
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2010-07-02 15:32:00 +02:00
ck
f692d5056f Maemo: Fix merge artifacts. 2010-06-24 15:20:45 +02:00
con
af44136e22 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
2010-06-24 11:40:22 +02:00
hjk
5adb6559e2 debugger: attempt to fix symbian output connections 2010-06-23 12:40:56 +02:00
ck
294ed8a344 Maemo: Adapt to new debugger infrastructure. 2010-06-23 12:08:25 +02:00
ck
dd666a3af4 Maemo: Add option to disable packaging.
Task-number: QTCREATORBUG-1636
Reviewed-by: kh1
2010-06-22 14:45:09 +02:00
Friedemann Kleint
ecff29be07 Compile Windows. 2010-06-22 12:28:05 +02:00
hjk
6a6cba5518 debugger: The DebuggerEngine refactoring.
This replaces the (de facto) singleton engines and data handlers by classes
that are instantiated per run. The DebuggerRunControl will now create an
object of (a class derived from) DebuggerEngine that contains all the relevant
"dynamic" data.

DebuggerManager is no more. The "singleton" bits are merged into DebuggerPlugin,
whereas the data bits went to DebuggerEngine.

There is no formal notion of a "current" DebuggerEngine. However, as there's
only one DebuggerEngine at a time that has its data models connected to the
view, there's still some "de facto" notion of a "current" engine. Calling
SomeModel::setData(int role, QVariant data) with custom role is used as the
primary dispatch mechanism from the views to the "current" data models
(and the engine, as all data models know their engine).
2010-06-22 10:59:57 +02:00
ck
a793217c07 Maemo: Prepare unpackaged deployment.
Reviewed-by: kh1
2010-06-21 11:28:42 +02:00
hjk
97edcb7977 debugger: start 'runcontrol-ification' of the debugger plugin.
This replaces most uses of DebuggerStartParameters by DebuggerRunControl
which is a simple RunControl with a DebuggerStartParameters member.

Plan is to move all global state to the run controls, and possibly
introduce specialized ones for core debugging etc.
2010-06-14 10:45: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
ck
2be1f9c61b Maemo: Preparation for deploying executable to arbitrary location.
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
ba3b881ffc Maemo: Set DISPLAY variable before running remote executable. 2010-05-12 17:21:38 +02:00
ck
ef7c5fae60 Debugger: Support running GDB over SSH.
Reviewed-by: hjk
2010-05-05 12:51:21 +02:00
ck
b61e656493 Maemo: Preparation for deploying executable to arbitrary location.
Reviewed-by: kh1
2010-05-03 16:56:38 +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
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
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
ck
ace402f0cb Maemo: Fix application output. 2010-04-20 08:58:11 +02:00
Erik Verbruggen
e3bceff3ee Separated child-process stdout/stderr, and seperated "our" output/errors.
So now the "Applciation Output" can distinguish between these four, and
handle them appropriately.
2010-04-19 14:21:48 +02:00
ck
8dd627a257 Maemo: When debugging, print gdbserver and application output.
Reviewed-by: kh1
2010-04-19 10:07:55 +02:00
ck
9faa4b5a59 Maemo: Only run dpkg if the package has been newly deployed.
Reviewed-by: kh1
2010-04-19 10:07:55 +02:00
ck
de9b203565 Maemo: Filter remote output.
Reviewed-by: kh1
2010-04-19 10:07:55 +02:00
ck
44a953e84c Maemo: Deploy and install packages instead of raw executables.
Reviewed-by: kh1
2010-04-15 14:47:01 +02:00
ck
7289fbfe90 Maemo: Do check for valid device confuguration earlier. 2010-04-15 11:37:50 +02:00
ck
2d7b3bf4a0 Maemo: Change misleading status messages. 2010-04-14 15:08:13 +02:00
ck
18a134ec37 Maemo: Kill old instances before deploying the application.
Reviewed-by: kh1
2010-04-13 16:31:33 +02:00
ck
f5bcb9858d Maemo: More refactoring in run control classes.
Move more common parts into base class.

Reviewed-by: kh1
2010-04-13 14:42:28 +02:00
ck
c7cee130d8 Maemo: Rename some run control symbols.
Rename function to better reflect its meaning.
Add prefix to class members.
2010-04-13 14:42:28 +02:00
ck
781bdd2441 Maemo: Don't run program if deployment has been canceled by user.
Reviewed-by: kh1
2010-04-13 14:42:27 +02:00
ck
dbafd89fdf Maemo: Don't expect gdbserver to start immediately. 2010-04-13 11:13:20 +02:00
ck
75b1fcdd66 Maemo: Add prefix to run control class members. 2010-04-13 11:13:20 +02:00
ck
8a6040c739 Maemo: Remove double initialization of debugger manager. 2010-04-13 11:13:20 +02:00
ck
5cce19f621 Maemo: Get rid of superfluous signal. 2010-04-13 11:13:20 +02:00
ck
e0f79f8855 Maemo: Refactor running, debugging and stopping
Move common functionality between run and debug into base class.

Reviewed-by: kh1
2010-04-13 10:05:32 +02:00
ck
23ef4f9c04 Maemo: Use deployment progress bar even when there's nothing to deploy.
Otherwise, an outdated canceled progress bar will confuse users.

Reviewed-by: kh1
2010-04-12 12:22:31 +02:00
ck
157ff4889e Maemo: Make errors more obvious to users.
Reviewed-by: kh1
2010-04-12 12:22:31 +02:00
ck
a62e533123 Maemo: Implement basic packaging. 2010-04-07 17:36:28 +02:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
ck
22b5c74709 Maemo: First attempt at packaging. Disabled for now. 2010-03-09 14:01:59 +01:00
ck
2e25571edb Maemo: Make deployment timestamps per host.
Reviewed-by: kh1
2010-03-05 16:07:14 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +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
8a4f1ab555 Maemo: Fix Qemu for recent MADDE.
Reviewed-by: kh1
2010-02-03 15:24:19 +01:00