Commit Graph

129 Commits

Author SHA1 Message Date
Friedemann Kleint
f76da43b05 Debugger: Replace virtuals by capability flags.
Change-Id: If09efd21dc44e356eb575bb6170356fdbd409b39
Reviewed-on: http://codereview.qt.nokia.com/2625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-04 14:35:18 +02:00
Aurindam Jana
ab574ba88d Delegate javascript debugging to Script and V8 debugger clients.
The appropriate client handles the debugging based on the service available at the server side.

Change-Id: I46b66036f700fc7e45e8b38cef7f1ce1445b1122
Reviewed-on: http://codereview.qt.nokia.com/2497
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-08-03 11:27:38 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3'
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
2011-07-29 17:57:59 +02:00
Kai Koehne
7aaab4d050 QmlDbg: Don't wait infinitely for messages on application output
We only connect to the port when we get a 'Waiting for connection ...'
message on application output. This was done mainly to avoid lots
of failed connects, and therefore an unresponsive UI on Windows.

However, the application output might be redirected for various reasons.
Therefore fall back to busy connect after a certain time (4 seconds
for profiling, 8 seconds for debugging).

Change-Id: Ie1b943f678ced40c030cc134493a2adf7e3bc9df
Reviewed-on: http://codereview.qt.nokia.com/2323
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-29 16:32:02 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3'
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
2011-07-25 13:57:13 +02:00
Kai Koehne
51a9ff7d4e Qml Tooling: Fix debugging & profiling of .qml files loaded from resources
Don't expect that every url specifying a file is a local file url. Instead
let FileInProjectFinder handle urls with other schemes gracefully, too.

Change-Id: I72457d502ff1caf52f588e8ec41ab260882d1cf5
Reviewed-on: http://codereview.qt.nokia.com/1840
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-21 12:27:43 +02:00
hjk
fdb0876e9c debugger: style
Change-Id: Ia3f2090ffac10149209d0152de65a90e1f822add
Reviewed-on: http://codereview.qt.nokia.com/1299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-07 11:59:04 +02:00
hjk
c041286753 debugger: split BreakpointIndex into plugin and debugger specific part
Change-Id: I21d10cf42eb039c74475e106537b6e107d155196
Reviewed-on: http://codereview.qt.nokia.com/745
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-27 09:14:25 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
con
2cf76ead26 Move OutputFormatter to Utils lib. 2011-04-26 10:45:21 +02:00
Christiaan Janssen
5692120ee3 QmlDebugger: synchronize watches when deleted
Reviewed-by: Kai Koehne
2011-04-21 12:28:11 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christiaan Janssen
7100d29f66 QmlDebugger: user input on watches
Reviewed-by: hjk
2011-03-24 13:21:30 +01:00
Christiaan Janssen
fd66f68671 QmlDebugger: Watchers
Reviewed-by: hjk
2011-03-24 13:12:57 +01:00
Kai Koehne
20189574f6 QmlJsDebugger: Handle breakpoints in qrc:// resources more gracefully
Reviewed-by: Christiaan Janssen
2011-03-02 14:45:20 +01:00
Kai Koehne
5f426c2382 QmlDebug: Make error dialogs non-blocking and shorter 2011-02-24 10:05:09 +01:00
Kai Koehne
1a3ed101cb QmlDebug: Parse application output to track debugees state
Setting up the debugger connection might fail for a couple of reasons.
Check the application output to show the user a more detailed error
message.

Reviewed-by: hjk
2011-02-23 17:02:34 +01:00
hjk
5f38a26c9e debugger: fix 'Jump To/Run to' when in instruction-wise mode 2011-02-23 11:11:39 +01:00
Friedemann Kleint
c74da9b7c5 Debugger: Reduce tooltip flicker.
Move tooltip-request handling from DebuggerPlugin into
DebuggerToolTipManager.

Request tooltip only if position changed and close
standard tooltip on success.
2011-02-17 10:11:23 +01:00
Kai Koehne
a24ae63c9f QmlDebugger: Remove unused code 2011-02-16 14:51:02 +01:00
Christian Kandeler
f08e42f9ec Maemo: Fix QML debugging.
In general, at least. Does not actually stop at breakpoints yet.
2011-02-11 16:03:34 +01:00
Friedemann Kleint
0ac879e39f Debugger: Make tooltips pinnable.
Replace old debugger tooltip by a new ToolTipManager which
has a list of AbstractDebuggerToolTipWidget with the functionality
to 'acquire' an engine (display its data) and 'release' it
(store engine data and display them as 'previous') and serialization
to XML session data.
DebuggerTreeViewToolTipWidget implements AbstractDebuggerToolTipWidget
for tree model acting as  a filter on watch models.

Rubber-stamped-by: hjk
2011-02-11 15:09:02 +01:00
Christiaan Janssen
5ac9a19465 QmlDebugger: displaying tooltips while qml is running
Reviewed-by:  hjk
2011-01-25 11:05:15 +01:00
hjk
6dd55aa471 debugger: introduce generic master/slaves engine 2011-01-12 12:17:47 +01:00
hjk
b4d6a5ba2a debugger: fix qml output channeling 2011-01-10 10:18:45 +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
hjk
9757e22113 debugger: introduce the concept of a 'Location', used by gotoLocation 2010-12-17 11:59:01 +01:00
Kai Koehne
bde8287cdd QmlDebugger: Also log messages from JSDebugger to debug console 2010-12-17 10:19:00 +01:00
hjk
2c46a935df debugger: make more bits private 2010-12-03 16:18:50 +01:00
hjk
d9210302ce debugger: mover qml related engines to the Internal namespace 2010-12-03 12:07:32 +01:00
hjk
75ee5bce8c debugger: make DebuggerEngine::acceptsBreakpoint(id) pure 2010-11-26 11:27:43 +01:00
hjk
585bb50d89 debugger: move qml engine private classes to internal namespace 2010-11-22 14:13:23 +01:00
Tobias Hunger
e85bfa7073 Windows: Fix some warnings 2010-11-15 17:51:54 +01:00
Christiaan Janssen
4790548216 QmlDebugger: Refactored QmlEngine and QmlCppEngine
Reviewed by:  hjk
2010-11-15 17:18:00 +01:00
hjk
8ae541b36f debugger: Refactor breakpoint handling.
The breakpoints are now (fairly) tightly guarded by the BreakpointHandler.
Engines and Views are only supposed to refer to them by id. They also have
individual states now. The breakpoint data is split into a "user requested"
"fixed" part in BreakpointData and the engines' acknowledged data in a new
struct BreakpointResponse.

TODO: Move m_state and m_engine members to BreakpointResponse. Fix regressions
in the marker handling.
2010-11-15 12:09:25 +01:00
Christian Kandeler
548df9385b Maemo: Use dynamic port list.
Check whether the ports we need are actually available on the device.
As a side effect, this makes it possible to debug more than one
application at the same time on Maemo.

Task-number: QTCREATORBUG-2702
2010-11-02 14:27:18 +01:00
hjk
6a7cbac057 debugger: code cosmetics 2010-10-27 15:23:30 +02:00
Christiaan Janssen
24912c3f2e QmlObserver: breakpoint list is shared between engines
Reviewed by:  Kai Koehne, Andre Poenitz
2010-10-05 11:01:14 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
2010-10-04 16:07:46 +02:00
Christiaan Janssen
05a89496e0 QmlObserver: breakpoint list is shared between engines
Reviewed by:  Kai Koehne, Andre Poenitz
2010-10-04 10:20:33 +02:00
Kai Koehne
226a82d3dc QmlDebugger: Log status of different services
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:42 +02:00
Friedemann Kleint
13c97d652e Debugger: Fixes around watch editing.
assignValueInDebugger: Pass on WatchData as well, pass
on values as QVariant. Based on that, do more extensive
checks in CDB, preventing assignment of non-PODs.

Locals/Watch editing:
* Disable while running
* Edit pointer values as hex with validation.

CDB: Strip class types off reported pointer values and reformat
the values as short 0x-pointer values, introduce flag to
WatchData::source to do dumper expansion handling.

Windows: recognize int64 as int.

Register handler: Fix accessing uninitialized value.
2010-09-23 13:22:08 +02:00
Christian Kandeler
ae4c35bd86 Maemo: Support QML-only debugging.
Reviewed-by: kh1
2010-09-16 17:08:58 +02:00
Friedemann Kleint
f7b19f8114 Debugger: Move DebuggerEngine/QmlEngine/QmlCppEngine into Debugger{}
namespace (from Debugger::Internal) as they are exported classes.
Introduce private classes to avoid exposing private JS debugger
headers.
2010-09-13 13:30:35 +02:00
hjk
7457083bab debugger: only update variables that are operated on 2010-09-13 08:32:37 +02:00
Christiaan Janssen
1c702357a6 QmlInspector: tooltips in qmldebug mode
Reviewed by: Lasse Holmstedt
2010-09-08 16:53:44 +02:00
Lasse Holmstedt
f1ff2a01cc QML Debugger: Mangle shadow build filenames
Without doing some magic for the filenames, we go to shadow build files
instead of the real ones, resulting in confusion. The user should never
see the shadow build files while debugging.

Reviewed-by: hjk
2010-09-08 14:55:07 +02:00
hjk
56fd90e5cc debugger: fix spelling of synchronous
Finally.
2010-08-30 10:38:38 +02:00
Lasse Holmstedt
31c8b444db QML Debugger: Show error messages when connection is lost
Related to Qt commit bd521ed56f8e4be7117dc3534c6fded68f7a70c5
2010-08-27 13:12:05 +02:00