Commit Graph

107 Commits

Author SHA1 Message Date
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
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
2011-08-10 16:03:57 +02:00
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
Kai Koehne
7c31bd6604 QmlCpp Debugging: Only set C++ breakpoints after QML is connected
If one hits a C++ breakpoint before the QmlEngine is properly set up
the debugging actions are all disabled. Patch 58faedc4e tried to
fix this by automatically executing continue in these cases, but
this let to errors on Mac OS X. Instead just delay the setting of
C++ breakpoints.

Task-number: QTCREATORBUG-5681
Change-Id: I149dea9b453ed7abd33a1a93b5b546d7c6cda8fd
Reviewed-on: http://codereview.qt.nokia.com/2568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-08-04 10:54:59 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/)
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-29 12:19:11 +02:00
Christiaan Janssen
619c0cc0d6 QmlCppDebugging: handling Harmattan mixed debugging
Change-Id: Idfc0a6d48bcc1c42aac58ea03b5a51ad6e661f25
Reviewed-on: http://codereview.qt.nokia.com/2275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-27 12:53:32 +02:00
Christiaan Janssen
cca8d1cbfa QmlCppDebugger: improved error message for early breakpoints
Change-Id: I461c0f85e4972af27a929e327877d9ad6ff9dbe3
Reviewed-on: http://codereview.qt.nokia.com/1833
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-19 16:20:42 +02:00
Christiaan Janssen
58faedc4e5 QmlCppDebugger: skipping breakpoints before QML debugging is started
Change-Id: I461488812976284e9f3af1bcea8399f504e150e4
Reviewed-on: http://codereview.qt.nokia.com/1524
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-12 14:53:33 +02:00
Christian Kandeler
6d61bdeafa Debugger: Support remote debugging for mixed QML/C++ projects.
Change-Id: Ic60cbbc92532ee91b3aa1099cf86d9fe84d61ed2
Reviewed-on: http://codereview.qt.nokia.com/1352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-08 10:48:03 +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
Christiaan Janssen
deb20493ae QmlCppDebugger: avoid failed assertion when one engine fails
Reviewed-by: Kai Koehne
2011-04-28 16:18:57 +02:00
con
14487af86c Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/projectexplorer/target.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
2011-04-27 11:27:29 +02:00
Kai Koehne
565c42a30e QmlDebug: Fix debugging for mixed projects on MinGW
We've so far missed the 'QDeclarativeDebug: ' messages, because they
were arriving on an unexpected channel.

Task-number: QTCREATORBUG-4630
Reviewed-by: Friedemann Kleint
2011-04-21 13:29:57 +02:00
Christiaan Janssen
42048fa2a0 QmlDebugger: fixed shutdown combined engine
Task-number: QTCREATORBUG-4451

Reviewed-by: Kai Koehne
2011-04-18 17:01:37 +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
a20846a052 QmlCppDebugger: breakpoint on cpp startup before qml is loaded (QTCREATORBUG-4158)
Reviewed-by: Kai Koehne
2011-03-21 15:15:12 +01:00
Friedemann Kleint
ad21b4859a L10n: tr()-Fixes. 2011-03-01 17:07:37 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
Friedemann Kleint
75f4b9cf25 Debugger: Add toolchain combos to start dialogs, refactor detection.
Add combo box listing toolchains with debuggers to start external,
attach and core.
Another attempt at streamlining engine detection:
Split in detection functions that first collect a list of
available engines by preference, then remove disabled and
wrongly configured engines and use the remaining best.
matching. checkconfiguration is now the central place where
engine detection and config check takes place.

Rubber-stamped-by: hjk
2011-02-24 16:50:15 +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
Tobias Hunger
fe33a0984e More copyright fixes 2011-02-18 10:37:19 +01:00