Commit Graph

13 Commits

Author SHA1 Message Date
Christian Kandeler
f0a54abf6b Maemo: Introduce dedicated Fremantle and Harmattan targets.
Task-number: QTCREATORBUG-2770
2011-01-18 15:22:12 +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
Friedemann Kleint
93e5942d0e Debugger: GdbChooserWidget: Fix memory leak, add tooltip.
Add a tooltip for disabled toolchains in the selector dialog.
2010-12-03 12:55:20 +01:00
Tobias Hunger
2e09df3d9c ToolChain: Rename RVCT toolchains to RVCT2
Reviewed-by: dt
2010-11-26 15:07:37 +01:00
Friedemann Kleint
019be3e850 Debugger: Improve gdb binary settings handling.
- Remove non-executable entries  on reading (check only
  absolute paths since path search is too expensive).
- Make sure gdb binary settings are not written out unless the
  user really changes them.

Reviewed-by: aep <arvid.picciani@nokia.com>
Acked-By: hjk
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2010-11-03 13:37:01 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
Friedemann Kleint
c717c1f9c7 Debugger: Suppress inconsistencies in gdb binary settings.
caused by the merging of global settings.
Terminate list of binaries by an empty element to prevent
accidental reading of consecutive keys.
Add Linux-ICC to list of toolchains for gdb.

Acked-by: hjk
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Task-number: QTCREATORBUG-2848
2010-10-25 15:21:36 +02:00
Friedemann Kleint
651cd50838 Debugger: Use raw path for gdb binaries.
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2010-09-29 11:32:36 +02:00
Tobias Hunger
f06512d5f7 Use ExistingCommand in PathChooser where it makes sense 2010-09-24 16:35:09 +02:00
Friedemann Kleint
b949cafc78 Debugger/gdb: Cosmetics, no gcc on Windows, width. 2010-04-08 17:14:05 +02:00
Friedemann Kleint
da22181916 Debugger[gdb]: Introduce new control for gdb binaries.
Manage binaries as a map of binary-><toolchain number>.
Provide list widget and editing dialog with tooltip
showing the version. Save in settings as a flat list of
keys.
Acked-by: hjk
2010-04-08 16:55:25 +02:00