Commit Graph

295 Commits

Author SHA1 Message Date
Aurindam Jana
f8bc2cbae5 DeviceManager: Allow user to configure desktop device
Show desktop device in the Devices options page. Allow
user to configure the port range for the desktop. These
ports can then be used by others such as QML Debugger.

Change-Id: I8c4a96207e54f58d1e9bc18c417cb378dc9f70c2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-05 11:47:26 +02:00
hjk
6f549a228d Debugger: Introduce a debugger engine talking to lldb command line
Change-Id: Ie6b9cb68045db12cff1bbb06a7049529fc39c21f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-22 10:31:44 +01:00
Friedemann Kleint
85d12bb409 Clean headers in debugger plugin.
Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-22 10:00:00 +01:00
hjk
bfdeca4948 Debugger: Rename lldb to lldblib
This is the approach directly linking to the lldb library.

Change-Id: I5d51ad59d8292b46539a55da8e23918fb7de9a92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-20 17:12:45 +01:00
Sergio Ahumada
fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-07 12:40:37 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Tobias Hunger
7a70b4f135 LocalApplicationRC: Rename files to localapplicationrunconfiguration.(h|cpp)
I ran once too often into them being called applicationrunconfiguration.(h|cpp)!

Change-Id: I280a3280173b80d4d955faddedf11688786eee14
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 14:46:47 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Kai Koehne
d2bb1fb8c3 Debugger: Remove superfluous Q_UNUSED
The variable is actually used.

Change-Id: I4b0510b2bad9d3f3f49609dcac5b314da5769c1e
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-20 14:50:04 +01:00
Friedemann Kleint
41a5461cf2 Debugger: Log exceptions in build pane.
- Introduce constants for task categories, add "RunTime".
- Log exceptions under "RunTime".
- Clear pane on debugger start.
- Add 'first chance'

Task-number: QTCREATORBUG-8141
Change-Id: Icf68def06c42a0f3bb86dcc2ae74750b5397ca52
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-02 16:22:12 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Christian Kandeler
aef4280bc1 Do not use QWeakPointer to track QObjects.
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-25 10:45:36 +02:00
Friedemann Kleint
fe2dd584fc Fix error handling for custom executables.
Prevent dialog showing "No executable" when canceling the
prompt for the executable when pressing 'Run' / 'Debug'
on a library project. Introduce new
LocalApplicationRunControl::ensureConfigured() to ensure
the configuration is complete and detect cancel via
empty/non-null strings.

Change-Id: I9bd4a296e7c995d26d6ad265519e7ebd3f98d6fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-18 16:10:22 +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
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
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
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
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
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
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
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
d215470bb0 debugger: code cosmetics
Add 'using', braces, line length...

Change-Id: Iefbe081e33301d39f729906d181dcad4f6c8f2a4
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-12 22:37:18 +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
ded2dd12b8 debugger: adjust to profile changes
This replaces the debugger command, sysroot and target abi fields
with a profile id.

Change-Id: I831c42ff8624fcfa520c2f28f6f06d73191b2680
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 15:30:15 +02:00
Tobias Hunger
d1971174d4 Remove unused member variable from debugger plugin
Change-Id: If630ba9b3d108c2b81316555e67d4bc6a6beb098
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-28 08:32:01 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Aurindam Jana
e85886d638 QmlEngine: Attach to Remote Process
In the case of Attach to Remote Process, try connecting immediately.
While, in the case of Attach to Remote Server, wait for output message
or timeout.

Change-Id: I94570a2ab05bb069ea64819fcbb0055555fe0f33
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-13 12:51:37 +02:00
hjk
545f9846d5 debugger: handle new 'LoadRemoteCore' in switch
Change-Id: I650d666a3d1eef23cbf34b0d7a3308666abcd42c
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-06 23:00:15 +02:00
hjk
cc6c3eab1a debugger: add Load Remote Core
Change-Id: I3ea5ddd608ff9e6764a995dc042466d436ca8474
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 17:40:48 +02:00
Tobias Hunger
5a79945ef6 DebuggingHelper: Move to QtSupport
* Move debugginghelper to QtSupport. ProjectExplorer should not start
  looking for Qt versions!
* Make autotools and generic project plugins depend on QtSupport

Change-Id: If28418a85e3696cba713e66148c893a5a9b6adc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-18 15:48:26 +02:00
hjk
071b24d97e debugger: fix translation contexts
* add a few Q_OBJECT
* change DebuggerRunControl::tr() to DebuggerPlugin::tr()

Change-Id: I7ed973ea71b3492e91b45784595d9471587f72ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-24 17:07:29 +02:00
Oswald Buddenhagen
822233629d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	src/libs/utils/utils.qbs
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qmljsinspector/qmljsinspector.qbs

Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
2012-04-19 16:13:09 +02:00
hjk
91cdadcbb6 debugger: disable the gdb fallback for MSVC compiled binary
The result of using gdb on msvc compiled binaries is not satisfactory.
It essentially shows raw disassembly only and allows switching
threads after user initiated stops. No breakpoints etc.

It is expected that people would never use the msvc/gdb combination
consciously so it seems better to not provide the feature at all.

Change-Id: I8918103e44643bfa1ad0b419a911a232f8a5299e
Task-number: QTCREATORBUG-7309
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@nokia.com>
2012-04-17 16:11:56 +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
hjk
f67c6dba11 debugger: prepare naive handling of multiple inferiors
Change-Id: I2ea81b1a9407ae7e5045aadf43b0c2d971fc615b
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-28 10:47:06 +02:00
Orgad Shaneh
280c7877d8 Debugger: Clear message on attach to core
If a usable engine was found, there is no reason to display errors
set by another engines

Task-number: QTCREATORBUG-7150

Change-Id: I50cec27a127a0af34b5287c389df6ce6a797bb3e
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-19 17:20:32 +01:00
Kai Koehne
f49098683a Debugger Settings: Make sure that Cpp, Qml checkboxes are initialized
Change-Id: I3fbced75504afd797346aa892a9f71e37c71f118
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-29 13:24:46 +01:00
Christian Kandeler
75c20e4dce Run configuration: Make debugger aspect display more configurable.
Change-Id: I4da0d92552146b9fa7a2236bce2f2ed0c9fe6147
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-24 16:08:30 +01:00
hjk
5898dc449e debugger: make qml port spinbox supressable in debugger runconfig aspect
Change-Id: I0d6e18e393e07b101c1b429825a8897a15317034
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-02-24 13:40:11 +01:00
hjk
43f69abea1 Rename {Analyzer,Debugger}ProjectSettings to *RunConfigurationAspect
Change-Id: I5913ddaaab1a80b1557f0bcf7ebcc15e0e4b74eb
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-23 18:16:46 +01:00
hjk
21558fa5d0 projectexplorer: remove useQmlDebugger from generic RunConfiguration
Change-Id: I9eb046348d4b56e64ffc2a2beb057d2fe090f8c3
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-02-23 16:03:34 +01:00
hjk
5ad396cf71 debugger: merge DebuggerLanguageChooser into DebuggerRunConfigWidget
This also lets runconfigurations like Maemo suppress the QML parts
completely.

Change-Id: I19573053b565b21be4407f1e0ea024c07ffd4d73
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-02-23 11:23:11 +01:00
hjk
503c6e2684 projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"
This is the first step of a larger refactoring. The plan is to make
debuggersettings more orthogonal to individual runconfiguration
implementation. This patch alone already pushes the settings handling
to the debugger plugin and removes code duplication in the
runconfiguration implementation.

Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 12:21:38 +01:00
hjk
b9d15b113f debugger: remove a few too-fancy typedefs
Change-Id: I0c8ba3c2d22ca7128527da42b81919dabbd82d14
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-16 11:15:28 +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