Commit Graph

283 Commits

Author SHA1 Message Date
hjk
ceb575741c debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-13 17:11:58 +02:00
hjk
e11a3a7697 debugger: rework WatchModel
It's one model for all locals, watch, return, tooltip and inspector
data. This allows more streamlined code paths and better isolation
of the model data from the WatchHandler. WatchItems are now registered
in a hash indexed by iname, so inames can be used as the primary
handle to watch data in the WatchHandler interface.

Change-Id: Idac0a808b5d785307496d1de4198a1f2e9ce3880
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-24 14:33:34 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Kai Koehne
7f09d0b756 Merge QML inspector into debugger plugin
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-09 12:42:44 +02:00
hjk
441b98b0dd debugger: make debuggerengine easier accessible to profiling
Change-Id: I5c9ed1e994e490a6a6859afc6ae1756b09b87af9
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 17:50:06 +02:00
Eike Ziller
529c0a8fe2 Merge remote-tracking branch 'origin/2.5' 2012-05-07 15:18:39 +02:00
Kai Koehne
e3f992b033 Debugger: Show location marker (again)
Change-Id: Ia66e42d90a00ba3ddc6425c0fa5a1d4dc896c545
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-03 17:35:27 +02:00
Aurindam Jana
bf4d9aed33 DebuggerEngine: Goto Location
Check for OperateByInstructionCapability before using the
disassembler agent.

Change-Id: I35f69f8df5da41eee22b2a94fe2d33c67b4d7f92
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-16 09:52:02 +02:00
Aurindam Jana
3d32f42b7d Debugging: Pass a DebuggingLanguage arg in executeDebuggerCommand()
Change-Id: I99eedc86c987615072b7400051b61700b98ebab3
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-10 13:12:10 +02:00
hjk
eb3a79a70f debugger: add some status output for breakpoint synchronization
Change-Id: Icace3e84b39fc94d617e4d82f812899aa605eb13
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-01 20:41:41 +02:00
hjk
c1e7a06e9f debugger: parse build-id-verbose output into tasks
Change-Id: I6bacc697c24185025f3342e43a29109bf75d8196
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-30 19:34:45 +02:00
Kai Koehne
2af301e253 Debugger: Bring Qt Creator to foreground if app interrupts
Change-Id: I07795f61b79cce9687d0ae2bff3cc19534ec08d6
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-23 11:29:01 +01:00
Kai Koehne
8966d82af3 Mixed debugger: Fix state warnings on exit
If the (child) engine is already in state InferiorShutdownOk
or InferiorExitOk, it will automatically proceed. No need
to call notifyInferiorIll(), which will lead to state warnings.

Change-Id: Id7501d327454095648be8c14d02520b2ed128e87
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-22 13:49:42 +01:00
hjk
4516c41ce3 taskhub: use more direct access.
Change-Id: Ibc4f37589f913ff9ea0025156979ddda73929e38
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 10:58:47 +01:00
hjk
b540ea6643 debugger: allow cleaner abort of autotest runs
Change-Id: I1dbfc5870fa86787975574a6b8e88ebbc8dfc322
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-08 14:40:48 +01:00
hjk
646ae570d7 debugger: better status messages on startup and interrupt
Change-Id: Id78f189bb55db618e5cbff233e4edebc2d6e886c
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-07 17:33:01 +01:00
hjk
ce6a80f337 debugger: extend semi-automanated tests to one level of expansion
Change-Id: I9063f4eecfe4c42926771cc46539932b4e353b8d
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-05 17:17:51 +01:00
hjk
1bc2a721c1 debugger: reset AUTORUN explicitly for manual tests
Change-Id: Ic71082ebd7779068886b68bce20d7d75c3055c17
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-02 16:01:03 +01:00
Aurindam Jana
0a2140f5e8 QmlCppDebugger: Handling Stack
Use a common stackhandler in the mixed engine
instead of individual stackhandlers in qml engine
and cpp engine.

Change-Id: If363fabb32ae7c6e652452ca2b2fbf8593e684a5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-28 15:44:48 +01:00
Aurindam Jana
a167498ea1 ScriptConsole: Show File and Line Info
Show File and Line Info for items that have the info. Clicking
on the item opens the file and sets the cursor position on
the line. The context menu also provides option to copy contents
and option to clear the view.

Change-Id: I161de392ba35e37d323b049371619b01c617c798
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-27 11:01:13 +01:00
Kai Koehne
949d8052ab QmlCppDebugger: Fix transitions if cpp engine fails in setup step
The CppEngine can abort the setup (e.g. because no valid debugger
is found) in state EngineSetupRequested. In this case the Qml Engine
will be already in state EngineSetupOk ... let it gracefully move to
InferiorSetupFailed via InferiorSetupRequested.

Change-Id: Ib2fe81193db30b7fa2db15e898d294182f8fc76d
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 18:09:59 +01:00
Aurindam Jana
147396d764 ScriptConsole: Refactor to QtMessageLogWindow
Move QML/JS independent classes to common Debugger
code. A Debugger Engine needs to override
evaluateScriptExpression() to provide engine
specific script evaluation.

Change-Id: I02b23b380a3eb1b12003b30ded0b7d075e44dfed
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 17:51:05 +01:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Daniel Teske
b267027c9e Optimize BaseTextMark
Instead of each BaseTextMark being a QObject and being connected
to editorOpened, centralize that and distribute the signal
to only the BaseTextMarks that need it.

Change-Id: I3f2783c34a25d78aa335418236850436028bfdf3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-14 14:27:30 +01:00
David Schulz
7889a20e22 added new mode for simple test
This mode is the same as USE_AUTORUN, except that the debugger will stop
if an test after a BREAK_HERE has failed.

Change-Id: I786459a101fb2ff0556f7ac640b1b0d21d674e8b
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-08 14:59:00 +01:00
Aurindam Jana
84b82446e0 ScriptConsole: Enable for mixed debugging
Change-Id: I00f3ebd2d6fff34424b1c3c291e8bd715387acfb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-07 15:27:00 +01:00
Kai Koehne
2a02841383 Debugger: Simplify handling of requestRemoteSetup in QmlCppEngine
Just emit the requestRemoteSetup on your own in QmlCppEngine. Also
properly check the related state transitions in DebuggerEngine.

Change-Id: I15dc4236303911126de7eee63ed996bdd8e5c5a8
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-31 14:14:05 +01:00
Tobias Hunger
97496df1bf Task: Update Task to use Utils::FileName and Core::Id
Use Utils::FileName and Core::Id in Task structure.

Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 11:34:43 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
hjk
7201923562 debugger: move isCppBreakpoint to Breakpoint
Change-Id: I241401fa010166982e5a95a699c99fbaa87188ef
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-24 17:10:28 +01:00
Kai Koehne
2ec1f1d970 DebuggerEngine: Avoid warning when aborting in EngineShutdownRequested state
Change-Id: Ib0e0a2bbf0fa7d109a3910d0814ec9edef130dc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:03:02 +01:00
Kai Koehne
6bb77534c0 QmlCppEngine: Fix warnings about invalid state changes
Change-Id: Iaa45ff106f5f71a2c7f4729c64c281921b855f80
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:02:34 +01:00
Kai Koehne
75a9d6961c DebuggerEngine: Avoid warning when aborting in EngineSetupRequested state
This can happen e.g. inside the QmlEngine as part of a QmlCppEngine.

Change-Id: Id649086b3febe91e73d4784f3abb7f6d7a0d0d50
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 14:59:30 +01:00
hjk
183769e7ef debugger: grey out Locals&Expressions when not accessible
Change-Id: I61489b9a5bf117be154ed6899beb3f8294247c9e
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 18:52:30 +01:00
hjk
496e9fafd0 debugger: replace static capability check by something potentially dynamic
This does not yet use the potential.

Change-Id: I087311fb7d59b46e49f65a84c4420c72a1227ebb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-01-16 16:33:43 +01:00
Aurindam Jana
720eb1df9e Debugger: Reset Location Mark
Call resetLocation() before setLocation().

Change-Id: I633d513ddc9a5a1683e81f7cabf127e79885ad4e
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 13:27:48 +01:00
Friedemann Kleint
a92e38f47f Debugger: Compile with QT_NO_CAST_FROM_ASCII.
(except gdbmi.cpp, name_demangler.cpp). Remove some unneeded
conversions, change some maps to take QByteArray keys.

Change-Id: I010f1251998a441fe5c8c87901b1e0c277c0391c
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-21 14:07:12 +01:00
hjk
5798225cc8 debugger: fix test automation
Change-Id: I11bf4c597747fdae658954b7193ac3ee4f39b06f
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-14 15:36:46 +01:00
David Schulz
d7d5a28c6e Check for '.' in handleAutoTest
jump over checks with the keyword
Check and CheckType for expanded variables

Change-Id: I909aec478db0fa77119bf555c738c56ed83070d7
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-08 18:18:28 +01:00
David Schulz
e846b53533 removed the double entry of keyword Expand in handleAutoTestLine.
Change-Id: Ib87aea29c608cd0913c1b32ea0ea1ed90b8e90ee
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-08 17:35:43 +01:00
David Schulz
c2cfceb6b2 Added the keyword CheckType for the simple_test
Change-Id: I2ecbf4d1d90e353506e7c164560b69b81fcc6c77
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-07 17:36:10 +01:00
hjk
add5c8cb7a debugger: test the data that ends up displayed, not the raw data
Change-Id: I9453abd43299416e8d8535f9567fe96ff976e413
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-25 18:53:02 +01:00
hjk
20cb2fe5a3 debugger: use tasklist for tasks generated by the "automated manual" test
Change-Id: Ife3830e12cd3f44c29dc3e531f104ffb894efe0f
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-25 18:25:22 +01:00
hjk
3e03c06420 debugger: start automization of manual tests
Change-Id: I33bd046eca253130049d0a80de7a1a3f3e442307
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-25 16:30:38 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-10 15:57:09 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
hjk
755f5fc327 debugger: cleaner debugger aborting
Make the second "Abort Debugger" kill the gdb process directly
instead of relying on further communication.

Also fix some "unexpected" (but harmless) state transitions.

Change-Id: I0938ec76420fbd77ec4b7348819dd7f63763547f
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 08:29:48 +01:00