Commit Graph

27 Commits

Author SHA1 Message Date
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
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
Christian Kandeler
1914d05db3 Maemo: Introduce explicit states to deploy step.
Probably fixed some subtle error handling bugs along the way.

Task-number: QTCREATORBUG-2705
2010-11-03 17:13:23 +01:00
Christian Kandeler
f2d14996ad Maemo: Add ports gatherer to deploy step. 2010-11-02 14:27:19 +01:00
Christian Kandeler
946cce3706 Maemo: Improve clean-up behaviour on remote hosts.
We now remove files we have created on the device because they are
temporarily needed. This includes package files, mount points and pipes.

Task-number: QTCREATORBUG-2709
2010-10-29 11:45:36 +02:00
Christian Kandeler
fe72f7c2f9 Maemo: Have only one MaemoDeployables object per Maemo target.
It does not depend on any of the settings in the deploy configuration.

Task-number: QTCREATORBUG-2678
2010-10-27 10:53:57 +02:00
Christian Kandeler
a437f824c4 Maemo: Display UTFS server stderr output.
This will help us diagnose errors.
2010-08-26 11:49:44 +02:00
Christian Kandeler
ea36611425 Maemo: Sanitize deployment step.
- Always use remote mounts for Fremantle.
- Always use SFTP for Harmattan.
- Never use SFTP deployment for non-packaging case (and get rid of
  the corresponding code).
- Fix the order of sub-steps.

Reviewed-by: kh1
2010-08-24 14:52:29 +02:00
Christian Kandeler
6bf5f7340f Maemo: Deploy to sysroot. 2010-08-20 12:50:10 +02:00
Christian Kandeler
f5193c790b Maemo: Enable deployment via remote mount. 2010-08-19 17:22:05 +02:00
Christian Kandeler
90dea9d645 Maemo: Better reporting of SSH timeouts, additional unmount step. 2010-08-17 10:47:36 +02:00
ck
3a4baff506 Maemo: Run configuration gets device from deploy step. 2010-08-17 08:47:13 +02:00
ck
b639a6e7c3 Maemo: Give display names to packaging and deploy steps. 2010-08-16 12:41:29 +02:00
ck
378ad4de3d Maemo: Device configurations now have a list of free ports.
The device configuration widget is now the only place the user
ever has to specify ports.
2010-08-13 16:19:21 +02:00
qt-info@nokia.com
724ecfcafb Maemo: Make deploy mount port user-settable. 2010-08-12 19:25:15 +02:00
ck
1ff13868dc Maemo: Add deployment via remote mount.
Only tested on Linux, #ifdef'ed for now.
2010-08-11 16:50:05 +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
ck
b96df669b1 Maemo: Make device configuration settable from deploy widget.
This is necessary in case there is no run configuration (e.g. for
library projects).
2010-07-16 17:11:26 +02:00
dt
615cda8430 Fix compile output to be readeable with dark themes
This changes the colors to be a mix of red/blue and the foreground
color. If the regular text color is either of those, well...
2010-07-15 11:11:21 +02:00
ck
8a3c1cc0d4 Maemo: Move INSTALLS information from package step to deploy step.
... because the files are installed even when packaging is disabled.

Reviewed-by: kh1
2010-07-14 12:22:30 +02:00
ck
d0cbac9032 Maemo: Make sure deploying stops when build step thread finishes.
This is important for the "canceled" case and doesn't hurt otherwise.
2010-07-14 12:22:30 +02:00
ck
9bd53be4c9 Maemo: Get rid of two unneeded functions. 2010-07-13 17:16:46 +02:00
ck
b58d452db0 Maemo: Add missing license headers to new class. 2010-07-13 16:27:50 +02:00
ck
ce5e473438 Maemo: Move deploying to dedicated deploy step.
Reviewed-by: kh1
2010-07-13 16:27:50 +02:00
ck
6fc00ddca8 Maemo: Introduce deploy step infrastructure.
Doesn't do anything yet.
2010-07-13 10:35:16 +02:00