Commit Graph

25 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
hjk
91e6c14ff9 debugger: find better separation between runcontrol and engine 2010-12-10 12:42:40 +01:00
hjk
26bc7f9037 debugger: remove displayDebugger() from the plugin interface 2010-12-10 12:42:40 +01:00
hjk
a181b45d28 debugger: rename 'stop/quit' to exitDebugger 2010-11-08 17:44:01 +01:00
hjk
b373da1b12 debugger: more handler/window refactoring 2010-11-08 13:20:12 +01:00
hjk
91ba3949d5 debugger: remove sessionengine 2010-11-05 13:36:18 +01:00
Friedemann Kleint
22f03cbde6 ProjectExplor/Debugger: Header cleanup 2010-11-02 16:14:00 +01:00
Friedemann Kleint
24cadd34a1 I10N: First translation fixes for 2.1
Fix README, some spelling errors, remove contractions,
exclamation marks, correct some plural forms, join split messages.
Add QCoreApplication::translate to non-Q_OBJECT-classes.
Fix some lupdate warnings about discarding meta-data (//:).
2010-09-10 10:51:43 +02:00
hjk
98e37b3b15 debugger: don't remove corefiles that we did not create. 2010-09-07 14:26:18 +02:00
Friedemann Kleint
83f3119c97 Debugger: Improve exit handling. 2010-08-18 11:08:50 +02:00
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +02:00
hjk
96561a38c7 debugger: enable debugging of multiple projects at the same time 2010-07-22 10:59:22 +02:00
hjk
d9e445bbe8 debugger: re-enable snapshot creation using the menu action 2010-07-21 09:42:33 +02:00
hjk
8d54298c8e debugger: handle shutting down engines from SnapshotWindow <Del> or context menu 2010-07-20 18:54:50 +02:00
hjk
d6fc1193ed debugger: more linear state handling in core adapter 2010-07-15 14:54:43 +02:00
hjk
fa8cf20dc0 debugger: remove finished engines from snapshot list 2010-07-14 17:49:17 +02:00
hjk
99fdaf06a2 debuygger: make snapshots using true parallel engines 2010-07-14 17:49:17 +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
25c11c4ce0 debugger: move SnapshotHandler from DebuggerManager to DebuggerRunControl 2010-06-15 12:48:30 +02:00
hjk
af14d9fc48 debugger: remove or rename a few images. 2010-03-22 15:09:41 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
con
ab74d23848 Avoid pulling in the svg plugin. 2010-03-05 16:03:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
hjk
18445dc9c6 debugger: make handling multiple core files a bit more convenient 2010-02-03 08:37:48 +01:00