Commit Graph

170 Commits

Author SHA1 Message Date
hjk
ef806894e8 runcontrols: use ProjectExplorrer::OutputFormat for format selection 2011-01-07 16:26:56 +01:00
hjk
8fd480bd21 merge addToOutputWindow and addToOutputWindowInline 2011-01-07 16:26:55 +01:00
hjk
2525ff3c71 debugger: try to reduce s60devicerunconfiguration dependencies 2011-01-06 18:36:31 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Pawel Polanski
bc466562ec If no Symbian device is connected the deployment process will be skipped instead of aborting the whole build. 2010-12-01 14:06:55 +01:00
Tobias Hunger
283af9d5ce Compile fix 2010-11-26 15:23:44 +01:00
Tobias Hunger
7169bfff39 Symbian: Introduce RVCT 4 toolchain
Task-number: 2481
2010-11-26 15:07:39 +01:00
Tobias Hunger
2e09df3d9c ToolChain: Rename RVCT toolchains to RVCT2
Reviewed-by: dt
2010-11-26 15:07:37 +01:00
con
3565245018 Fix debugging Symbian gcce raptor built apps.
Local executable is put into a different folder
(always 'armv5' despite it being a 'gcce' build, changed in qmake),
and the symbol file is named 'foo.exe.sym' instead of 'foo.sym'.

Done-by: Friedemann Kleint
Reviewed-by: Pawel Polanski
2010-11-25 17:47:56 +01:00
con
fb3524af90 Fix debugging Symbian gcce raptor built apps.
Local executable is put into a different folder
(always 'armv5' despite it being a 'gcce' build, changed in qmake),
and the symbol file is named 'foo.exe.sym' instead of 'foo.sym'.

Done-by: Friedemann Kleint
Reviewed-by: Pawel Polanski
2010-11-25 15:54:21 +01:00
Pawel Polanski
fcdd588bb6 Fixed USB detach related bug on Symbian
Task-Number: QTCREATORBUG-3100
Reviewed-by: Tobias Hunger
2010-11-22 11:53:06 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
2010-11-17 13:19:07 +01:00
Pawel Polanski
d6d7b97a61 Debug progress bar removed form Symbian debugging
Task-number: QTCREATORBUG-2846
2010-11-04 15:37:26 +01:00
Friedemann Kleint
a82d57de8a Qt4ProjectManager/Symbian: Header cleanup. 2010-11-03 10:03:48 +01:00
dt
ff60fcf29f Revert "Revert "Qt4ProjectManager: correctly set parse state on restoring""
This reverts commit ae6dbf364b.
2010-11-02 16:43:11 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
hjk
ae6dbf364b Revert "Qt4ProjectManager: correctly set parse state on restoring"
This reverts commit b979d9f151.
2010-10-29 15:25:08 +02:00
dt
b979d9f151 Qt4ProjectManager: correctly set parse state on restoring 2010-10-29 12:23:32 +02:00
dt
45dd1ad7f5 Disable Run Configurations while parsing .pro files
Initial patch and idea by hunger.
Reviewed-By: hunger
2010-10-28 16:09:41 +02:00
con
ffbbca4cc6 Don't crash while reporting a configuration error (S60 debugging)
Task-number: QTCREATORBUG-2828
Reviewed-by: Robert Loehning
Reviewed-by: Friedemann Kleint
2010-10-20 15:37:22 +02:00
Friedemann Kleint
66ad76de4f I18n: tr-fixes. 2010-09-13 16:51:43 +02:00
Pawel Polanski
5ce3f8ab7a Symbian target supports sub-projects.
Reviewed-by: Tobias Hunger
2010-09-11 10:44:06 +02:00
Tobias Hunger
616a9b13f0 Enable restoring the default names of project configuration items
* Enable support for this in all ProjectConfiguration items
   (Targets, projects, BCs, DCs, RCs, etc.). This is nicer
   than having custom code in individual configuraiton items.

Reviewed-by: dt
2010-08-24 16:04:51 +02:00
Friedemann Kleint
5b4f826552 S60: Dis-embed the embedded run S60 debugger run control.
As it created 2 output panes that could be closed indepently
of each other.
2010-08-20 15:23:42 +02:00
Friedemann Kleint
6840c1d198 Debugger: Refactor run control termination.
Fix breakage introduced by the new asynchronous stop() methods
of the debugger run controls. Allow for RunControl::stop() to
be asynchronous by introducing a return enumeration indicating
that. Introduce additional method aboutToStop() asking user
to quit (tie that to the RunControl instead of having to hack
the behaviour elsewhere).
If asynchronous stop is detected, terminate the ProjectExplorer
asynchronously.
This makes the behaviour consistent across switching sessions/
closing outputwindow tabs and quitting Qt Creator.

Reviewed-by: dt
Rubber-stamped-by: hjk
2010-08-20 14:19:25 +02:00
Pawel Polanski
fa68a545a8 Executable's UID added to the DebuggerStartParameters. Used for debugging on SymbianOs 2010-08-20 13:02:14 +02:00
Pawel Polanski
6e90b51937 Removed unnecessary launch process from S60DeviceDebugRunControl for Symbian
Bug QTCREATORBUG-2088 has been fixed
Task-number: QTCREATORBUG-2088

Reviewed-by: Friedemann Kleint
2010-08-20 10:49:44 +02:00
Pawel Polanski
ace96f3fc3 Deploy related data has been moved from Run-Configuration into Deploy-Configuration. Symbian OS
Reviewed-by: Tobias Hunger
2010-08-16 17:16:20 +02:00
Pawel Polanski
cd5492eb14 Progress bar for Launching for S60 sequence has been changed to behave like for other targets
Reviewed-by: Tobias Hunger
2010-08-16 16:01:31 +02:00
Tobias Hunger
53b14384d5 Fix Build-/DeployConfiguration mixup 2010-08-10 12:31:48 +02:00
Pawel Polanski
d654612cfb Small cleanup for Symbian's RunConfiguration 2010-08-03 15:08:16 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
2010-08-02 14:21:05 +02:00
dt
05ae17eadd Fix subdir project deployment for symbian
We create a .sis package per leaf project now, deploy all of them and
start the executable for the runconfiguration that was selected. This
does not cover all use cases, but works for development.
2010-07-26 19:44:07 +02:00
Pawel Polanski
c7278acda0 Installing on a drive other than C: for Symbian OS
Silent installation added to Sumbian's Run Configuration UI

Reviewed-by: Tobias Hunger
2010-07-26 13:32:03 +02:00
Pawel Polanski
647b91c78f Refactor deployment for Symbian OS
* Add buildstep to handle the deployment
 * Remove deployment code from the runconfiguration
 * Update .user files to add new deployment step into existing setups

Reviewed-by: Tobias Hunger
2010-07-22 11:07:58 +02:00
dt
7862e31256 Refactor OutputFormatter
Move link handling code to outputwindow from OutputFormatter

Move createOutputFormatter to the RunConfiguration

That makes it easier for Qt4RunConfiguration et all.
This also fixes that each time a runcontrol was rerun a new
OutputFormatter was created without deleting the old one, thus
increasing the memory usage.
2010-07-14 13:01:43 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
2010-07-06 18:36:30 +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
hjk
5adb6559e2 debugger: attempt to fix symbian output connections 2010-06-23 12:40:56 +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
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
Tobias Hunger
9c4d7f1a95 Improve "Waiting for TRK" dialog
Task-number: QTCREATORBUG-1552
2010-06-10 13:58:16 +02:00
con
7d76940af7 Take the right sis package when using the Smart Installer flag. 2010-05-21 14:18:37 +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
con
3922be1b2e Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
2010-05-11 13:39:21 +02:00
con
7d88da6a32 Find created sis files, even if DESTDIR is set.
Symbian mkspec puts the package file into the build directory,
not the destination directory.
2010-05-07 10:42:39 +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
Friedemann Kleint
799c624caf Fix trk-Launcher output connection. 2010-04-22 12:29:20 +02:00