Commit Graph

952 Commits

Author SHA1 Message Date
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
2012-09-11 14:02:03 +02:00
hjk
15ea29533a debugger: use DeviceProcessesDialog directly for attaching
Change-Id: I916c42bc141f5bfbf5dd163b3d9dfeed3703ed94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-07 15:26:06 +02:00
Friedemann Kleint
c3f50e3192 KitChooser: Introduce virtual methods for Debugger.
Introduce virtual methods such that it is possible to
write derived classes for specific KitInformation classes,
allowing for filtering and setting text and tooltip.

Remove debugging-specific code of KitChooser from
the ProjectExplorer.

Move populate() away from the constructor as not to call
virtuals from it.

Implement DebuggerKitChooser. It should no longer be
possible to to choose an invalid kit for debugging
from the debugger starter dialogs.

Add a protected constructor to DeviceProcessesDialog
allowing to pass a KitChooser.

Change-Id: I8c683a2da7d69bfbccdc08213cb47d69a0df8b3e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:49:20 +02:00
Friedemann Kleint
af6bbc442e Add debugger engine type to configuration.
Introduce a struct DebuggerItem as a debugger configuration
item, containing debugger engine type and binary. Store
information as a variant map. Add a combo box.

Remove engine guessing logic. Parts of it are still required
when checking the suggested debugger from the SDK.

Split error checking to be able to do a quick error check
and find only valid profiles in the matchers.

Pass on errors up to RunControl::create().

Change-Id: I08653e2a76ca2c371701082f8173b0b8f8ed462e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:49:11 +02:00
Daniel Teske
7657dd3a47 Add error string to IRunControlFactory::createRunControl
And add a few helpful error messages

Task-number: QTCREATORBUG-7826

Change-Id: Ia9f9fa476cecf2cff198bc460408bc062e119338
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-05 14:38:51 +02:00
Eike Ziller
887456e38a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemoglobal.cpp
	src/plugins/madde/maemoinstalltosysrootstep.cpp
	src/plugins/madde/maemopublisherfremantlefree.cpp
	src/plugins/madde/qt4maemodeployconfiguration.cpp
	src/plugins/qt4projectmanager/librarydetailscontroller.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/plugins/remotelinux/abstractremotelinuxdeployservice.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp

Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17
2012-09-04 18:04:16 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Friedemann Kleint
71ea54c036 Fix debugger detection when attaching from output pane.
Obtain RunConfiguration from RunControl add logic to
use the ABI if that fails.

Task-number: QTCREATORBUG-7677

Change-Id: Iebf053e6b7a25644a4d4c02b80bf952ef9e6a078
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 11:56:33 +02:00
Eike Ziller
a225e5b867 Merge remote-tracking branch 'origin/2.6' 2012-09-03 09:08:49 +02:00
Friedemann Kleint
6886e485de Handle watching/tooltips of C++ editor tokens consistently.
For editor tooltips and the editor context menu
'Watch expression', always try to find a local variable first
and use its expression.

Change the tooltip manager/widgets not to rely on the debugger
model enum and obscure expression, filter by complete iname
instead. Remove obsolete enumeration.

Change gdb's handling of tooltips such that local variables
are displayed immediately without creating additional tooltip
items.

Change-Id: I9b55823428029ba50d84d3a8cab55eb58942e72b
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:02:56 +02:00
Eike Ziller
25dea9a393 Merge remote-tracking branch 'origin/2.6' 2012-08-31 09:28:19 +02:00
Friedemann Kleint
e67e58378d Debugger: Use gdb's tooltip expression fixup for CDB and editor.
Factor out to watchutils.

Change-Id: I8cf316be819d765dcea964ac6405bfa9b075de59
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:56:22 +02:00
Oswald Buddenhagen
a32e243e61 Merge branch '2.6'
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
2012-08-30 20:43:02 +02:00
Friedemann Kleint
3797595c31 Fix 'Attach Debugger' in output pane.
Bring back the slot, suppress a warning about empty binaries
in the release check.

Task-number: QTCREATORBUG-7677
Change-Id: I2f1703b38b68995a1e2533ed8a6c94985cc3b430
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 11:53:35 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-27 17:00:03 +02:00
hjk
29ec32a531 ProfileChooser: make more robust in case of no configured profiles
Change-Id: I53945617cc616d2bfe4726b4e6e45cad7b400c44
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 15:33:09 +02:00
Friedemann Kleint
5b69bee198 Use QT_NO_CAST_FROM_ASCII for debugger plugin.
Fix gdmi escape routine by using a traits class to adapt
QByteArray/QString.

Change-Id: Ic6d2a0c927e4613aec9f69095bbb04a393e9edb9
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:46:25 +02:00
Eike Ziller
fc49c03a63 Merge remote-tracking branch 'origin/master' into 2.6
Final merge of master into 2.6.
2012-08-24 08:42:02 +02:00
Friedemann Kleint
78aa94c8c6 Debugger: Improve engine detection.
Remove the RunConfiguration parameter from guessCppEngineType()
and use the DebuggerStartParameter::toolChainAbi only.

Use fillParameter() to set the debugger command and toolchain
in order to prevent mismatches.

Add logic trying to figure out the profile to fillParameters()
in case the profile passed in is 0 for the command line cases.

Use CDB matcher for post mortem and Remote CDB, fix it to
prefer 64bit CDB on 64bit OS.

Change-Id: Icedc3883fe15660303060498ab609957e6d01cd1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 17:20:50 +02:00
Eike Ziller
bc67246432 Merge remote-tracking branch 'origin/2.6' 2012-08-23 15:52:15 +02:00
Friedemann Kleint
aee8f8832b DeviceProcessDialog: Introduce methods for modal/non-modal use.
Add methods to be able to use the dialog as a non-modal
dialog showing a list of processes or a modal-dialog
for selecting a process.

Connect double-click to 'Accept' for the modal
case (regression from 2.5).

Change-Id: If05a1c40ee6a41135d943e9919a1250db03eeffb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-23 15:40:13 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Friedemann Kleint
2f51579fe4 Debugger: Fix string usages.
- Compile with QT_NO_CAST_FROM_ASCII.
- Remove single character string constants.

Change-Id: Icece98619b6c30e047d3fce00e6ae74bbcd53c67
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-22 12:24:24 +02:00
Eike Ziller
b3e465c9d4 Merge remote-tracking branch 'origin/2.6' 2012-08-17 09:09:00 +02:00
Vladislav Navrocky
d76c5ca205 Added setting for breakpoint full path by default
Change-Id: Ibb068bdecf73c5bae0b31b08506209f05b811965
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-17 08:17:56 +02:00
hjk
f880c0e5b5 debugger: use host from profile for the attach to qml option
Change-Id: I81903ba752b9758fb4b9e342d40ac756716caecf
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 12:36:50 +02:00
hjk
6228fb1d78 debugger: remove line noise, adjust (internal) menu group names
Change-Id: I16d2b753022492d3f7b50dae0800b053c2a5e881
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 12:36:39 +02:00
hjk
f1b5d6a569 debugger: use Profile directly for fillParameters instead of its id
Change-Id: Ifaf663ee1827976e45e68e309b19c2f233a05ac1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 12:35:40 +02:00
hjk
60de95aff6 debugger: Remove dead code
Change-Id: Id59c9df315f7b19cd8a705e4283e749fb71b4dce
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-16 12:35: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
hjk
98a5fefb9a debugger: simplify the handling of the start script option
Script will be used if and only if there is one given. No extra bool.

Change-Id: I095e01b2243f0fa1f7ba2ce9591e3d67b6de5241
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-14 14:03:14 +02:00
hjk
d42b9b026a debugger: remove commandline options to disable debugger engines
This was mostly useful in cases where the guessing magic failed.
With the new Profiles, the debugger engines can be adjusted there.

Change-Id: I96622775588bb46c3e4e35af27e352593eb405d1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-14 14:01:56 +02:00
hjk
81d3c35a98 debugger: add "External" to "Start and Debug Application" menu entry
In line with the new documentation.

Change-Id: I06eb97b99bd79b7c7a4ff4ecc67c96cf39650e52
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-14 09:47:14 +02:00
hjk
63fbe5ffe0 debugger: remove explicit lldb option
It's currently non-functional and if revived in the future it should
blend into the new target based options.

Change-Id: I87988611496c232523acea973160be846d47a3dc
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-14 09:47:06 +02:00
hjk
379e4ed3c7 debugger: Merge "Start and Debug {Local,Remote} Application" dialogs
Change-Id: I81a95b592c480254d84d45e71d95f924944db1eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-13 17:19:55 +02:00
Tobias Hunger
cac2819838 Fix crashes when no default profile is set
* Handle 0 when calling createTarget to avoid the crashes in the first place
* Do not try to create/add targets for 0 profiles to avoid creator writing
  a warning to the console
* Fix possible crashes in debugger when no default profile is set.

Task-number: QTCREATORBUG-7695
Change-Id: I9afc8e29c8b859ad078dad794ef5017168daac78
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-13 14:22:46 +02:00
hjk
e7fea1aa7a debugger: streamline classical dumper setup
Remote dumpers are not used anymore, there's also no need to
have it in the engine base class anymore.

Change-Id: If0b6930b07e468d5973d848e02696bc5da40a197
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-12 22:43:24 +02:00
hjk
ac9458e664 debugger: move qtInstallPath closer to place where it is used
Change-Id: I6ed602a7cf498d56fa79cef72aebe7742bc50075
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-12 22:42:25 +02:00
hjk
e537aa62d8 debugger: remove dead code
Change-Id: I959be322f030f08f8ec1692751545f3bb5f62aee
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-09 03:49:18 +02:00
hjk
7a6beafa69 debugger: merge attach to local and remote process dialogs
This also merges a larger part of the two code paths.

Change-Id: I84a88c53ebc0073becac88ba04e63efd9a4a98b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-08 12:15:45 +02:00
hjk
ff337d63eb debugger: rename attach option
Rename 'Attach to Running Remote Process' to 'Attach to Running
Application'. The location and type of application to attach to
is determined by the Target.

Change-Id: Iac20c01aecf3825f176b4b209ad28140bec7aea5
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-06 12:27:43 +02:00
hjk
1283233f4b debugger: move startgdbserverdialog from remotelinux plugins
Change-Id: Ic382437bb99fe1b6bda9b1252e286cb3b9476191
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-31 14:33:03 +02:00
Tobias Hunger
b8120f29fd Fix support for MSVC2012.
Change-Id: I0ecf6f2d93f1911c8a243f8159e64f7d014bd036
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-30 23:31:24 +02:00
hjk
6cbcdf243f debugger: remove unued gnutarget parameter
Change-Id: Ic1c663bb11f7bf9420b35686ddeb581d31242b7f
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:14 +02:00
hjk
26e7ed14b7 debugger: remove unused code
Change-Id: I105aa0433530abb4e9f53de19c0846281ccda0cf
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:39:00 +02:00
hjk
c6f7eaea59 debugger: remove channel lineedit in StartRemote dialog
The information can be retrieved from the Profile information
nowadays.

Change-Id: I964cb4a782bb746bb97edbdb03cc99d64153106c
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-25 10:38:50 +02:00
hjk
e3a5e27eb7 debugger: merge local and remote core selection
Change-Id: I1659eb5a13283814d307c4b4b7adaec87bbbbe9d
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-24 17:11:19 +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
hjk
f820f10bc1 debugger: code cosmetics
Namespaces, whitespace.

Change-Id: I83df57b32a1a31b208181d65849688c09941a0be
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-18 16:27:49 +02:00