Commit Graph

611 Commits

Author SHA1 Message Date
Yuchen Deng
4537e1b834 Add support to force skip deploy before running or debugging
When we enabled the option "Always deploy project before running it",
and try to running or debugging a big project, e.g. QtCreator.
We need waitting a long time for deploy it.
But in fact, we not need this in every time.
So we can add two menu items:
"Run Without Deployment" and "Debug Without Deployment".
We can running or debugging directly.

Change-Id: I6ba92aa0cfa792cef923012856b79c29a672252c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-28 17:36:56 +02:00
Kai Koehne
e453585df5 Debugger: Always prefer files in loaded projects even for "Attach to QML Port"
Change-Id: Ia26e3664878339f9f92681deb12d018e31e6c13a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-10-28 17:02:52 +02:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
2011-10-28 10:17:44 +02:00
hjk
e9620aa3b1 debugger: fix hard-coded location of declarative debug symbols
This really should not be needed to start with.

Change-Id: Ife4349fe2d590c7a379d30b59a83bc9f54aeb063
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-27 10:56:28 +02:00
Yuchen Deng
2db25cb4b8 Add "Ctrl+F10" for "Run to Line" action
In Visual Studio or WinDbg, The "Run to Cursor" hotkey is "Ctrl+F10".
I think it very useful for debugging.

Change-Id: I0d224b7e74ea66b8f555ff01ce47674c8d202c90
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-26 11:33:42 +02:00
hjk
cb430f1d70 debugger: fix order of special actions to start debugging
Change-Id: I0190012c4fe2ea916947561cb76e7974410fd6a1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-19 12:00:41 +02:00
Eike Ziller
8eb8368139 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
2011-10-17 14:22:32 +02:00
Kai Koehne
f5ec093e3b Debugger: Automatically adapt to the languages the running engine supports
We used to get the layout only from the current/last run configuration. However,
this fails for engines started by other means (Debug->Start Debugging submenu).

Change-Id: I87e12457c7cd68a326ac1827298a3542e149199b
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-13 17:43:57 +02:00
Kai Koehne
60c4160ebd Debugger: Avoid 'start debugging' action being enabled why debugging
Don't let updateDebugActions() (triggered e.g. by project changes)
mess with the state fo the Start Debugger, Step, Next actions while
an engine is running.

Change-Id: I08ee20c70f9ff712f928f8ba04ac3d60d5669f11
Task-number: QTCREATORBUG-6290
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-13 17:22:13 +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
hjk
3afe677e52 debugger: fix typo
Change-Id: I80b706800452ec53c12985f71ea2ffbc9ab667bf
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-13 11:46:51 +02:00
Aurindam Jana
cb0b3424b3 QmlJSScriptConsole: Refactored ScriptConsole, added functionality.
The ScriptConsole is renamed to QmlJSScriptConsole. The console can be used
to evaluate expressions during a QML application debug session.
Changes:
* Console can be used even when application is not on a debug break
* The object context is the currently selected object in Inspector
* ContextMenu has a Clear option
* Multiple line expressions are supported
* Traverse Command History using up and down arrow keys

Change-Id: I4e1cd8763d60be43dbba395ead2a9a086d6bab7d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-12 15:03:00 +02:00
Kai Koehne
7dc88639dc QmlProfiler: Allow user to specify a sysroot for "Attach to Port"
Change-Id: I943255e5a501610195e3758f9fbb42d127f15524
Reviewed-on: http://codereview.qt-project.org/6451
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2011-10-12 11:12:15 +02:00
Kai Koehne
58f987cd07 Debugger: Always show "Start Debugging" methods
Don't rely on the 'current' project settings for actions like
Attach to QML port. Also, group the actions in a General,
Cpp and QML part, and add separators in between.

Change-Id: I3103a6fc777180a69eee128d39d19de17f312ff3
Reviewed-on: http://codereview.qt-project.org/6323
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-10-10 16:46:47 +02:00
hjk
8482269186 debugger: work on locating debuginfo
Change-Id: I49b9375af757117d46ba68301b3f5b241b2f1766
Reviewed-on: http://codereview.qt-project.org/5815
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-29 19:11:32 +02:00
Eike Ziller
5bc6692ee5 Reduce number of categories and minimum size of preferences
Merges the Project, Qt4 and Tool Chain categories into one Build & Run
category, which makes it finally possible to reduce the minimum height
of the preferences dialog.

Change-Id: I8d94aac9c9531200f5d8ca212a53d3edc5734138
Reviewed-on: http://codereview.qt-project.org/5023
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-29 16:26:48 +02:00
hjk
b9002dc763 debugger: take actual breakpoints into account for source locations
Change-Id: I5cf2982812456249fca2f233514cb90bb8d3bfe0
Reviewed-on: http://codereview.qt-project.org/5799
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-29 14:50:03 +02:00
Friedemann Kleint
72f221c005 Debugger: String usage fix.
Change-Id: Ia1fb09dee055f2507494b9666da7a6ada1103296
Reviewed-on: http://codereview.qt-project.org/5710
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-09-28 12:13:27 +02:00
hjk
84a535bae7 debugger: hack to specify sysroot in generic remote linux
Change-Id: I9657f71246df4742329a0b4f27bf08f146e9632a
Reviewed-on: http://codereview.qt-project.org/5534
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-26 13:12:04 +02:00
hjk
ee24278121 debugger/remote linux: add dialog to start gdbserver on the device
Change-Id: I57ddfa17a7c51a9347b0d81205c1679c6398d126
Reviewed-on: http://codereview.qt-project.org/5383
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-22 14:22:11 +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
85a1841f2c debugger: add option to search debug info in well-known locations
Change-Id: I16e32f0e44fc628c7dca5270083a9bb1050769c1
Reviewed-on: http://codereview.qt-project.org/5371
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-22 09:32:12 +02:00
Aurindam Jana
dbfae9fb28 QmlDebugger: Attach to QML Port: Fix errors
Connect to user defined host and port. Increased maximum connection tries.

Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-09-19 13:56:08 +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
fd7808a26f debugger: better remote debugging
Add option to specify location of debug information to dialog.
Default is sysroot + usr/lib/debug.

Change-Id: I8c2ab448f4aba9385da617d23419e521e3ae263c
Reviewed-on: http://codereview.qt-project.org/4919
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-14 17:03:40 +02:00
hjk
d191b22dfa debugger: split the 'start and debug remote' and 'attach to remote' cases ui-wise
Change-Id: I229ba996bfe2b38fb30891cdad5f62b6fe430443
Reviewed-on: http://codereview.qt-project.org/4898
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-14 15:23:18 +02:00
Aurindam Jana
bfe5b520f1 QmlDebugger: Added dialog "Attach to QML Port..."
The dialog is added to Debug->Start Debugging menu option. It specifies the host
and port that the JSDebugClient connects to for listening to debug messages.

Change-Id: I7f828c169ff2338f4780025f72182c5fc8784c4a
Reviewed-on: http://codereview.qt-project.org/4824
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-09-14 11:11:31 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
hjk
60afc7fffa debugger: slightly saner behaviour for the threads combobox
Change-Id: I20400b037f00a5dbaf11cbbfb184a5bf526883cc
Reviewed-on: http://codereview.qt.nokia.com/4095
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-01 16:37:31 +02:00
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 13:47:33 +02:00
Friedemann Kleint
b4afce82a6 Pass Abi when attaching debugger to application launched via 'Run'.
Task-number: QTCREATORBUG-5808

Change-Id: Id35e13fd71f4de7912070e90cda6add07200c7ae
Reviewed-on: http://codereview.qt.nokia.com/3069
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-17 09:58:10 +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
Friedemann Kleint
4c4a8d716d Debugger: Fix "Run to Line", "Jump to Line".
Change-Id: I33d7d6e0ef2f10d9198491e0562118687726d2aa
Reviewed-on: http://codereview.qt.nokia.com/2979
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-15 16:56:52 +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
hjk
24fefc3d5b debugger: remove 19 symbols of dubious benefit
Change-Id: I79c27331582e3e34449ba9f7ce6f3cfec4b99639
Reviewed-on: http://codereview.qt.nokia.com/2630
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-04 15:42:22 +02:00
hjk
6665923fcc debugger: string cosmetics
Change-Id: Ie2322e0b63d65c6c29f7d280113aef6a45dbdb71
Reviewed-on: http://codereview.qt.nokia.com/2586
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-03 19:05:59 +02:00
hjk
a4f23dc545 debugger: re-organize actions
Task-number: QTCREATORBUG-5660
Change-Id: I25516dc5cab8035e3d1be7025435f1a762d1ee3c
Reviewed-on: http://codereview.qt.nokia.com/2585
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-03 19:05:28 +02:00
hjk
2a2bde0510 debugger: better name for remote targets in snapshot view
Task-number: QTCREATORBUG-5511
Change-Id: Icb5f239ff4be61110b894919aecc57355bb04860
Reviewed-on: http://codereview.qt.nokia.com/2526
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-02 18:26:22 +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
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
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
Friedemann Kleint
97ad34bcc4 Debugger: Set tooltips on Step into/Next.
Indicating they'll do Stop & Break at main().
Do not display for QML projects.

Change-Id: I10b6ee381f17dca89c7152e38514fb95776bc329
Reviewed-on: http://codereview.qt.nokia.com/1777
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-07-19 08:34:20 +02:00
Eike Ziller
e5ca4b3462 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
2011-07-15 14:29:07 +02:00
hjk
5e410ae6cf debugger, bookmarks: use char[] for string constants
Change-Id: I2ef319e4556da1b93ae82afd597e0445d1f81d8d
Reviewed-on: http://codereview.qt.nokia.com/1692
Reviewed-by: hjk <qthjk@ovi.com>
2011-07-15 11:01:52 +02:00
hjk
0c3743bb56 debugger: use saved "resize columns to contents" settings
Change-Id: I88d50205d6ba626e0b4bf66879271fafab81e8cb
Reviewed-by: con
Task-number: QTCREATORBUG-5320
Reviewed-on: http://codereview.qt.nokia.com/1379
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-08 16:10:33 +02:00
hjk
b23aa10890 debugger: cosmetics
Change-Id: I64f28d8e665a39b5942c6e09151d368571006220
Reviewed-on: http://codereview.qt.nokia.com/857
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-28 20:08:46 +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
hjk
d647a6002e debugger: display "sub-breakpoints"
<MULTIPLE> happens in constructors, inline functions, and
at other places like 'foreach' lines.

Change-Id: Ifb89b659d279f257ba8295b80a35d605820ec54b
Reviewed-on: http://codereview.qt.nokia.com/498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-06-20 11:34:22 +02:00
Pawel Polanski
3f750695b4 Symbian: TRK is no more!
TKR-related code has been removed.
From now on CODA is the default On-Device
Agent

Change-Id: I52236a33aff9b31ca48d507da97430df7d871239
Reviewed-on: http://codereview.qt.nokia.com/450
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-06-10 16:45:38 +02:00