Commit Graph

18 Commits

Author SHA1 Message Date
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
6445ffc489 Maemo: Fix file removal problem on Windows.
Apparently, we can't delete read-only files.

Task-number: QTCREATORBUG-3343
2010-12-16 18:05:22 +01:00
Christian Kandeler
20e749df08 Maemo: Move "mad info" parsing for Qemu specs into dedicated classes. 2010-11-30 15:32:02 +01:00
Christian Kandeler
8a89a8bd8e Maemo: Make SSH connection error messages a bit more helpful.
Task-number: QTCREATORBUG-3225
2010-11-30 10:56:45 +01:00
kh1
1d2fa45a94 Fix usage of mad command, seems we depend on the system env. 2010-11-29 18:35:27 +01:00
Christian Kandeler
16c919462b Maemo: Get rid of some environment setting redundancies.
Reviewed-by: kh1
2010-11-26 17:54:01 +01:00
Christian Kandeler
9385fc12a7 Maemo: Fix recursive directory removal.
It's not an error if the directory does not exist.
2010-11-26 14:41:43 +01:00
Christian Kandeler
7fd0b2dbb6 Maemo: Fix code redundancy.
Recursively removing a directory was implmented twice.
2010-11-26 12:20:18 +01:00
Christian Kandeler
220a3d1a37 Maemo: Remove remaining barriers for concurrent debugging.
Pipes and mount points for debugging with on-device gdb now have
unique names.
Also give mount point for deploying via UTFS per-project file name.

Task-number: QTCREATORBUG-2702
2010-11-02 15:08:30 +01:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00
Christian Kandeler
947f0f3a30 Maemo: source all relevant profiles and ignore non-existing ones.
Reviewed-by: kh1
2010-09-13 16:50:30 +02:00
Christian Kandeler
26aec74359 Maemo: Some adaptations for Harmattan.
Reviewed-by: kh1
2010-08-25 09:53:42 +02:00
ck
ca7f49071b Maemo: Complete support for debugging via remote gdb.
1) Make sources available on device.
2) Enable users to switch between gdb and gdbserver approach (users may not be able to use the former if they have no control over their firewall).

Reviewed-by: kh1
2010-07-30 16:48:40 +02:00
kh1
4a16cb9c38 Final step to be able to set remote environment.
Task-number: QTCREATORBUG-1663
Reviewed-by: ck
2010-07-29 14:43:42 +02:00
ck
08bc6c0027 Maemo: Get rid of MaemoDebugRunControl.
Use Debugger::DebuggerRunControl directly instead of wrapping it
into another RunControl.

Reviewed-by: hjk
2010-07-15 17:01:31 +02:00
ck
9b30763e9d Maemo: Factor out redundant code. 2010-07-13 17:16:46 +02:00
ck
e17b99e7f3 Maemo: Introduce class for maemo-global functions. 2010-07-13 17:16:46 +02:00