Commit Graph

130 Commits

Author SHA1 Message Date
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
hjk
8184d8e703 debugger: simplify DebuggerEngine construction
The master engine pointer can be given later.

Change-Id: I4d72679dcbd5fe7291067a5e78c984d26cc187aa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 11:56:10 +02:00
hjk
081fb1f062 debugger: simplify parameter guessing
With profiles we have more reliable information, no need for some
of the guessing anymore.

Change-Id: I1818fbb112d44c99ef96c8643256432805a1b97b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 11:27:16 +02:00
hjk
776fd73e30 debugger: don't store active languages twice
Change-Id: I6517b42b4cfd0d2d919fa2971c3ea0995443cbf3
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-15 13:30:51 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget*
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:15:53 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Tyler Mandry
f930db7e0a QmlDebug: Fix crash when remote setup fails
Change-Id: Ia9b6e86b74425ed2c5bc113f918f1d64d88c328c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-25 10:14:07 +02:00
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
Christian Kandeler
69a437873a Fix compilation.
Change-Id: Iabaa6fd23ae3ab80c405a698e005eed6d5b4c9d1
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-08 09:09:06 +02:00
Aurindam Jana
6ae69447a4 QmlInspector: Update inspector
Update inpector when evaluating expression in
inspector for mixed debugging.

Change-Id: If2bad9d59b3ec3c0f2aa2a2d5f8a594701662bd0
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-06-08 02:53:40 +02:00
Aurindam Jana
9eb539469d WatchHandler: Add isInspect()
Change-Id: I237f77554a06bf7c139a8ae5cfef79c6fb4c8507
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-15 11:35:20 +02:00
Kai Koehne
c9dad3cff2 Debugger: Don't trigger gdb calls for inspect properties
Change-Id: Iaed71894cb2b2e340e7fbbe2045842bc85bd5fe0
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 14:34:13 +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
Aurindam Jana
fa6817a6fa QmlCppEngine: Update Views when switching between engines.
Change-Id: I90958e77c4d8c845ef6e55fe65eaffe0ac24dcc5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-04-25 11:15:09 +02:00
Kai Koehne
56e17e53c2 QmlCppEngine: Fix cpp bp insertion when debugging QML
The cpp slave will be interrupted when inserting breakpoints.
Track in this case the cpp engine state until it's running again.

Task-number: QTCREATORBUG-7230
Change-Id: I4cf275916d8f0581916d95f2f440ea12358aeeeb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-11 10:20:36 +02:00
Kai Koehne
b8d69b37fc QmlCppEngine: Call quitDebugger already in InferiorShutdownRequested
Doing it in (CppEngine) EngineShutdownOk will result in a write to
an already closed socket.

Change-Id: Ie9712f33d57348ecb27e31eaeb44f42f159a400c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-10 17:10:11 +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
Aurindam Jana
3781a17700 QmlCppDebugger: Fix tool tip expression
Change-Id: I1dd81d87c744b4a7f8bd86ac08d95bc5e63bd17f
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-30 15:47:50 +02:00
Aurindam Jana
13e8ff6f03 QmlJSInspector: Enable/Disable based on engine state
Change-Id: I078d12fb16fe61908e5b90ebf819c9fd9e8faae0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-30 15:06:46 +02:00
Aurindam Jana
cf43cc4391 QmlCppEngine: Return engine capabilities of current engine
Change-Id: If006ecaf09314c00822a70f790a69eb73edc2d28
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-29 11:59:32 +02:00
Aurindam Jana
aea3297932 QmlJSInspector: Reposition the Tool Bar
Change-Id: I529f976e90fef1670e65b650525b6f31e8b8f397
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-28 13:06:10 +02:00
Kai Koehne
32cb245883 QmlCppDebugger: Quit the qml debugger before the connection already closed
Change-Id: If8eddda3f99b6aef501f43f05b6667c250ab7659
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-03-08 10:11:13 +01:00
Aurindam Jana
9ebec701c5 QmlCppEngine: State Transitions
Ensure proper state transitions of the slave engines.

Change-Id: I875543f4d547fccf5df30b78a071e1c3d3d7f18f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-02 12:25:15 +01:00
Aurindam Jana
cc3efc47f2 QmlCppDebugging: Always Delegate call to Cpp Engine
Mixed Engine delegates all calls to CppEngine. The state transitions
of the cpp engine ensure that the qmlengine is called correctly.

Change-Id: I7490858a91f5120a83b781ca605ad157e19d7949
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-02 12:25:04 +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
6668ee1317 QmlCppDebugger: Shutdown engine on port busy
Shutdown the debugger engines when the qmljsdebugger port
is busy.

Change-Id: If7f470b04bae26f3bac11863f697b260b463ca4e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-28 15:44:38 +01:00
Aurindam Jana
1cd4ae9488 QmlCppDebugger: Implement notifyInferiorIll()
Change-Id: I6d2091fff62eb0dabceda4da4eb49d2f63f99484
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-23 14:05:34 +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
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
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
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
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
hjk
31d5ec9cab debugger: enable forceful abort of mixed qml/cpp engine
Change-Id: I815f0bf91e8ca58c9e472f81a234834dc341f29d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 15:00:00 +01:00
Kai Koehne
daac078756 QmlCppEngine: Properly handle requestRemoteSetupCalls
Remember which engines called requestRemoteSetup.

Change-Id: I75d11a21f0ebcbce1bba0aa4f653d1cc35b43483
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-17 11:36:19 +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
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
Robert Loehning
4aebc18a7b Moved unused code for debugging
Change-Id: I591bc847f91bfd628f7af8a034d3abc40b8d242c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-21 14:10:12 +02:00
Aurindam Jana
7a1bf412fb QmlCppEngine: StackWindow Behaviour
Enable/Disable the stack window based on engine state.
Update the markers in the stack window correctly.

Change-Id: Idbc694aa2a4be9497e2e3b2c9e9a1f463e1c7692
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-18 11:12:55 +02:00
Kai Koehne
be35fecf91 Debugger: Disable stepping from QML->CPP for the time being
Change-Id: Iafcc460a374bada67609dc1210cc1b787d267bfa
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-13 17:21:58 +02:00
Kai Koehne
f8700f19ae Debugger: Expose which languages (QML, C++, Any) an engine supports
Change-Id: Ia690b5cda84738c303ae7b6bd579e43313728525
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-13 17:21:49 +02:00
Kai Koehne
d2d3c6dd15 QmlCppEngine: Make sure that breakpoint markers get removed
resetLocation() called by DebuggerPlugin::handle* should automatically
reset the locations for stepping etc.

Change-Id: I3e20f93ade7f40e1e1f33b1b48b11522b59771f8
Task-number: QTCREATORBUG-6291
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-13 11:56:10 +02:00
Friedemann Kleint
d0ef489710 tr()-fixes for 2.4.
Change-Id: Iaf94e8b634cd68bc8a5eaacc65df47fc40f2b3c7
Reviewed-on: http://codereview.qt-project.org/6173
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-06 17:07:51 +02:00
Kai Koehne
732334a0b8 QmlCppDebugger: Decouple states of engines
The main engine now follows mostly the state of the gdb engine,
only if a breakpoint is hit/while stepping the state of the qml
engine is used. This allows us to hit C++ breakpoints at any time
(also when the qml engine hasn't been able to connect yet), and
also fixes the invalid transition warnings.

Change-Id: If67a56fd28b098952be2606d0a46e04c27835f66
Reviewed-on: http://codereview.qt-project.org/5897
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-10-04 16:00:15 +02:00
Kai Koehne
1d4f0cfc27 QmlCppDebugger: Reshuffle DebuggerState case expressions
Use the same order as in the enum definition.

Change-Id: I80e220a9f6260cf91f153eb98e7520bb8e6ba36e
Reviewed-on: http://codereview.qt-project.org/5895
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-04 13:54:55 +02:00
Aurindam Jana
43465cbe7a Debugger: Show QML Script Console only for QML debugging
Change-Id: Ibb0f03c77a84ee8682d44944e8a24fac54cb60fe
Reviewed-on: http://codereview.qt-project.org/5329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-09-22 12:27:38 +02:00
hjk
58cb19e55e all: less QScopedPointer
Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-19 08:56:44 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3'
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
2011-08-30 15:59:07 +02:00
Kai Koehne
4b96d7d867 QmlCpp debugger: Fix clicking on QML stack traces
Change-Id: I1e83dfc490bc871d106fb44357759829b3a1a6c4
Reviewed-on: http://codereview.qt.nokia.com/3593
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-25 14:12:13 +02:00
Eike Ziller
bf8cb5d4fc Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
2011-08-16 10:21:55 +02:00
Kai Koehne
52b7b58542 QmlDebugger: Fix QML Script Console for mixed debugging
Both the Debugger View and the QML Script Console use
executeDebuggerCommand(...). Forward this to QmlEngine if
the QmlEngine is stopped (because only then teh QML Script Console
is enabled), to C++ otherwise.

Change-Id: I4ba72b56a6205db5346e167b85e9353d05adae41
Reviewed-on: http://codereview.qt.nokia.com/2829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-08-11 10:18:49 +02:00