Commit Graph

192 Commits

Author SHA1 Message Date
Eike Ziller
0a0de08efb Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/plugins/find/treeviewfind.cpp

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe
2012-05-10 08:14:36 +02:00
hjk
dd66fe6c48 Revert "debugger: improve expansion behaviour of pinned tooltips."
This reverts commit 89cee4313c,
as part of the patch breaks QTCREATORBUG-7277.

The GDB case should not filter the Locals model, but the Tooltip model
to display tooltips. CDB has no choice, as the tooltips are expressions,
i.e. cannot be handled, so using the Locals as fall back there is ok.

Change-Id: I196bc683e06f68301bd86aa6fcce14ad2e8c5774
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-09 14:11:20 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-17 09:53:44 +02:00
Aurindam Jana
459f00642b QmlDebugger: Refactor QML Signal Handler
Refactor QML Signal Handler to QML Signal Emit. This is because the
debugger breaks when a matching signal is emitted irrespective of
whether there is a handler connected to the signal.

Change-Id: I852ace75c1962290717ed127ac5938d7505b9a7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-04-16 12:40:59 +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
Erik Verbruggen
f1b2100e34 Move the ModelManagerInterface out of the CPlusPlus library.
Change-Id: Iffaa18f848a22f6961b49dff048672b194570df6
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-03-14 11:46:24 +01:00
Robert Loehning
9988c471fe Replaced one-char-strings
Change-Id: I0bf982b508a237e5b1e6ba3279cb589bae1b1c1d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-03-07 09:18:15 +01:00
Denis Mingulov
87b1dc25a1 Debugger: use QString::fromLatin1 instead of QString::fromAscii
By source - latin1 is really expected as there is no any check
or usage of QTextCodec::setCodecForCStrings() currently.

QString::fromAscii() might break 'Latin1' input in some cases.

A quote from documentation about QString::fromAscii():

"Note that, despite the name, this function actually uses the
codec defined by QTextCodec::setCodecForCStrings() to convert str
to Unicode. Depending on the codec, it may not accept valid
US-ASCII (ANSI X3.4-1986) input. If no codec has been set, this
function does the same as fromLatin1()."

Change-Id: I49cf047ca674d2ec621b517c635d1927bb2e796f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-16 10:27:04 +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
Friedemann Kleint
38510a482d Debugger: Fix interrupting code.
- Windows: Always use DebugBreakProcess if Qt Creator is compiled
  64bit. Else always use win64interrupt.exe if Qt Creator
  is a WOW64 application.
- Remove redundant code (procinterrupt/hostutils, gdb adapters).
- Give interruptProcess an errorMessage parameter such that it can
  be used by all C++ engines and a proper error is displayed.
- Improve error messages.
- Build win64interrupt if target architecture is 64 bit (clean tools
  profile, add a profile), borrowing the check from
  qtcreatorcdbext.pro.

Change-Id: I2a6caf98e46051c49c84e1f3aac4c8d2aba66e8b
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-02-02 16:25:42 +01:00
Friedemann Kleint
c27a463fe7 Debugger: Add Disassembling of functions.
- Add "Disassemble function..." action with dialog for name
  to stack window.
- Add "Disassemble" with function name from code model to
  the Editor context menu.
- Change the engines to be able to disassemble a function without
  address.

Change-Id: I812f4672d97d9a866ee7f5a38dbd18b2876bccfa
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-01 17:57: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
David Schulz
e7e74db758 Edit debugger so win64interrupt is called
when trying to debug a 64bit application under windows.

Task-number: QTCREATORBUG-2521
Change-Id: I38922a6bed09640ce88184e6913a9fbb1d7433de
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-25 12:16:00 +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
hjk
e8598fa3dd debugger: compile fix
Un-breaks cdb engine after 24177e67dea.

Change-Id: Ibf99e1de4178a3d92a213266ecae490db437ca7a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-16 17:37:18 +01:00
Leandro Melo
3b67e5dd37 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I516c496175afe94c57b8a1dd978d9c5cccc44610
2011-12-21 17:17:14 +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
Friedemann Kleint
d5b655131b Debugger[CDB]: selectThread(): Remove call to resetLocation().
It is unneeded and causes the thread window to become disabled.

Change-Id: I9a3621bc574cf6774b401de7eb925741db3b9f35
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-21 10:44:18 +01:00
hjk
89cee4313c debugger: improve expansion behaviour of pinned tooltips.
Task-number: QTCREATORBUG-6554
Change-Id: I26ea4e5eb5826baaa6fd3bd4b199dd34e88703e0
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-13 20:53:08 +01:00
Kai Koehne
66949f2b45 Debugger: Hide memory related actions in context menus for QML only
Change-Id: I29f09f983146fff3301426703db0b93090c6507c
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-01 16:34:51 +01:00
hjk
fa66a540fd fix C++11 string literal incompatibility
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-22 15:51:41 +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
ea63113364 debugger: consolidate listing of local processes
Change-Id: I409fd58b3e9bb10de50e18e3658790c73e3fd521
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-11-03 13:57:07 +01:00
hjk
2b8e8cd8df debugger: move Q_OS_WIN to dbgwinutils.h
Change-Id: Ic84179e34d7ef79016d7646b6502f188c00b0bac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-11-03 11:38:12 +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
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
Aurindam Jana
32ef6c563d V8DebuggerClient: Enable breakpoints on Exceptions
Previously break on exceptions was always enabled. Now, the user
can add a breakpoint on Javascript Exceptions from the breakpoint
window in the debugger.

Change-Id: Ia9ee813d2fccf89b607fe1dcbad47b4084155a48
Reviewed-on: http://codereview.qt-project.org/6348
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-11 11:25:34 +02:00
Kai Koehne
87713f50c6 QmlCppDebugger: Set cpp breakpoints right on startup (again)
Previous commit allows to hit cpp breakpoints before the QML engine
is up and running, so there is no need anymore to set breakpoints early
on.

Change-Id: Ia0de490d54057d51c4585c56fa9083de982ba97b
Reviewed-on: http://codereview.qt-project.org/5896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-10-04 17:12:37 +02:00
Aurindam Jana
3c61cbb5df Debugger: Change BreakpointOnSignalHandler to BreakpointOnQMLSignalHandler
Change-Id: Ic71299c38863cdb55862ced7348b2bdc9cf39555
Reviewed-on: http://codereview.qt-project.org/5743
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-09-30 16:19:17 +02:00
Friedemann Kleint
5e7e6e5a9c Debugger[CDB]: Introduce setting for breakpoint correction.
Make it possible to turn it off in case something goes wrong.
Squeeze/polish the CDB options dialog and correct translation code
of the break options.

Task-number: QTCREATORBUG-6207
Change-Id: I1805558abd4478ab680b1e292bb13306b3a0ff05
Reviewed-on: http://codereview.qt-project.org/5838
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-09-30 10:00:02 +02:00
Eike Ziller
950cbe8597 Build fix for windows.
Change-Id: I959ae0bd0938744b4afc55a804e476483ca9fdb5
Reviewed-on: http://codereview.qt-project.org/5810
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-29 17:53:14 +02:00
Aurindam Jana
f05683ac7e JSDebugger: Enable break on events.
The user can request Javascript break on event. The user can provide
this info in the Breakpoints Window and provide the slot which will
be called when the event occurs. For example: specify "onTriggered" if
you need to break on Timer triggered event.

Change-Id: If936d7402f5978a182132fdcca75515588364e16
Reviewed-on: http://codereview.qt-project.org/4758
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-09-16 11:42:54 +02:00
hjk
c6a8b39a03 debugger: hard-code some qt5 related paths
This is not a final solution.

Change-Id: I19e7a99e1b056704864d27855197678a0d3fd10b
Reviewed-on: http://codereview.qt-project.org/5073
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-16 11:06:20 +02:00
hjk
ce9ea72c67 debugger: allow partial updates to the register set
Change-Id: Iafa2f9a235e3c44e0d225a1700a9c4d202f13959
Reviewed-on: http://codereview.qt-project.org/4887
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-14 13:09:18 +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
9b544a2740 QmlCpp Debugging: Only set C++ breakpoints after QML is connected (CDB)
Apply the change we did in 7c31bd6604 also for CDB. The mixed engine
directly calls attemptBreakpointSynchronization as soon as the QML engine
is connected.

Change-Id: I764f785bb5f0575a9a624e29632d21caf5dde39c
Reviewed-on: http://codereview.qt.nokia.com/3468
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-24 11:18:01 +02:00
hjk
56af8bfbe3 debugger: compile fix on windows
Change-Id: I6d4780129eb34fa69ae88d15b276a250a3d552c6
Reviewed-on: http://codereview.qt.nokia.com/2978
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-15 16:29:45 +02:00
hjk
8dca664901 debugger: reduce namespace line noise
Change-Id: I8e4cabd8bd4a4378590daf92a647ecbbe7d0a28b
Reviewed-on: http://codereview.qt.nokia.com/2970
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-15 15:13:03 +02:00
Friedemann Kleint
9e3e7d3691 Compile fix.
Change-Id: I6ce0d3d063cda97d55d102b8d6988934e5411846
Reviewed-on: http://codereview.qt.nokia.com/2771
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-09 11:12:38 +02:00
Friedemann Kleint
795d4506e6 Debugger: Fix MSVC detection.
Trigger AttachCore for MSVC flavours only.
Handle .dmp files on the command line.

Change-Id: I65be1ad7aef36db157a84499ff5e10d9f1e8fb97
Reviewed-on: http://codereview.qt.nokia.com/2766
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-09 10:39:56 +02:00
Friedemann Kleint
97a2cc53cf Debugger[CDB]: Implement AttachCore for debugdiag dumps.
Change-Id: I19c57248ed5e7c43b14b849419c9edf29bca26dc
Reviewed-on: http://codereview.qt.nokia.com/2706
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-05 17:43:58 +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
Friedemann Kleint
613a4cc09c Debugger[CDB]: Re-enable grab widget.
Broken by 7100d29f.

Change-Id: I7c7b8e071cd3713549316be35a8f9611f46c1212
Reviewed-on: http://codereview.qt.nokia.com/2107
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-25 14:11:52 +02:00
Friedemann Kleint
7c99c0cca3 Debugger[CDB]: Fix warning.
Change-Id: Ia844014a2e7385567e3299cc47384c60346e8cbb
Reviewed-on: http://codereview.qt.nokia.com/1445
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-07-11 16:32:41 +02:00
Friedemann Kleint
53295db969 Debugger[CDB]: Display more context in disassembly.
Emulate gdb's behaviour trying to disassemble the function.

Task-number: QTCREATORBUG-5205
Change-Id: I2f4dc9393e12324b0423734c5235758a25395fec
Reviewed-on: http://codereview.qt.nokia.com/1029
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-04 10:25:43 +02:00
Friedemann Kleint
9e5bcf2f4b Debugger [CDB]: Fix module resolution.
Use breakpoint id as response id to identify breakpoints
in reponse to 'list breakpoint' command.

Change-Id: I31686aef0193bf2e26e38482c7efebf294a358c4
Reviewed-on: http://codereview.qt.nokia.com/940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-30 12:07:22 +02:00
Friedemann Kleint
90ee1cc1c9 Debugger: Add infrastructure for message tracepoints.
Add context menu to add a 'message tracepoint', that is,
a trace point that outputs a user message and continues.
Intended to be a replacement for manually inserting
a qDebug() into the code to understand the call sequence.
Yet to be implemented for gdb.

Change-Id: I1c303001421fbbae74d98d15d52718579350db6e
Rubber-stamped-by: hjk
Reviewed-on: http://codereview.qt.nokia.com/756
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-27 10:42:50 +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
Friedemann Kleint
a68aff709f Debugger[CDB]: Do not detach on shutdown in case of console.
Do not use effectiveStartMode in shutdown.

Change-Id: Ia300f511f335de4a7d9d7c07e2080cecc91042e4
Reviewed-on: http://codereview.qt.nokia.com/680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-23 16:45:59 +02:00