Commit Graph

315 Commits

Author SHA1 Message Date
hjk
b63f3f808c Debugger: Keep secondary dialogs on top of the main window
Change-Id: I1f4283a5727db976d999d4cf4c7e444de8592566
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-10-17 10:27:15 +02:00
hjk
d335635491 Debugger: Remove DEBUGGER_TEST issues category
Was used by the semi-automated tests which have been merged into
the autotests now.

Change-Id: I899ac95b7134b8c5a838c29d4c16904e85118abf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-14 16:38:07 +02:00
hjk
976c044696 Debugger: Apply static pattern to DebuggerToolTipManager
Change-Id: I49869c393b922da75572959973b917894f93f4ec
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-14 09:19:02 +02:00
Kai Koehne
3bdc50d1b1 Fix break point warning dialog
QMessageBox apparently only saves the state in the actual
QMessageBox instance ... anyhow, it's the only place in
QtCreator where we use QMessageBox, which makes it look
somewhat alien. Instead, use CheckableMessageBox and
extend it for an information dialog.

Task-number: QTCREATORBUG-9876

Change-Id: I8014e972943dd4a336952325ebb9f6cbc5dd0902
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-13 16:24:30 +02:00
Christian Kandeler
72d173829c Remove superfluous include paths from project files.
A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
    a) Paths that are already set in more general files
       such as qtcreator.pri.
    b) Paths that serve no purpose at all, possibly
       left over from earlier versions of the project.
    c) Paths that act as workarounds for wrong include
       statements of the form '#include "xyz.h"', where
       xyz.h is not in the same directory as the including
      file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.

Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-02 17:28:17 +02:00
Tobias Hunger
a7bb77288d BC: Move builddirectory handling into BC itself
Use setBuildDirectory() in the different BuildConfigurations instead
of reimplementing that over and over again.

Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-28 11:41:38 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
Tobias Hunger
85b2017a69 TaskHub: Move code to be more conform with other singletons
Make methods static and add a instance() method for Signals/Slots.

Remove ProjectExplorerPlugin::taskHub() method and use the new
ones instead.

Change-Id: Ifae24ff19579fc524cbd61bddc826095c443adfa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-19 11:24:32 +02:00
hjk
d0eb10582b TaskHub: De-noise user code
Change-Id: Ieb559e884fb08c96d739cf7684389ff740a6233e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-02 12:06:32 +02:00
Eike Ziller
4a596c8eee Remove script manager and script debugger engine.
Doesn't really serve a purpose any more.

Change-Id: I8c3bc11bf7b05a15eafd2a22456a40b270cefadf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-01 12:01:11 +02:00
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
Aurindam Jana
122bd50144 Debugger: Check start parameter languages for engine type
Change-Id: If5a05d12e7597516510d5726ca6d3418b3393251
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-27 10:21:34 +02:00
Daniel Teske
ba315fa750 IRunControlFactory::displayName: Remove unused function
It's never used.

Change-Id: I11cc85b1d9a5944017b8a03738877f91cfe5d11f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-25 18:33:51 +02:00
hjk
4d6ce81e0c Debugger: Don't scan directories that do not exist.
Change-Id: Ie79249039643041fd68da6766b0e6f3ca6080b86
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 15:26:43 +02:00
Aurindam Jana
b85eddb2ea QmlDebugging: Support both IPv4 and IPv6
Change-Id: I562780c0894f596863c4c8b9cc9b12e3a3a98f33
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-18 14:10:56 +02:00
Aurindam Jana
f9d2b6498f QmlDebugging: Query available port
Use QTcpServer instead of TcpPortsGatherer.

Change-Id: I85133c5ae192b407009c5b21df332c9d3d94acda
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-18 14:10:43 +02:00
Tobias Hunger
47abeac15b Use EnvironmentAspect to retrieve the environment
Change-Id: If878e22cc2715d05bb3e65ad908cd4fb5e21b03b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-11 15:15:08 +02:00
Tobias Hunger
fd1f284892 RunConfigurationAspects: Move method to create config widget
Move the method used to create a config widget for a
RunConfigurationAspect from the RunControlFactory into the aspect
itself. This allows for aspects that are not bound to any factory,
which is what I eventually want to use to hold the environment for
run configurations.

Change-Id: Icceb5f44ca9eb63a87b9c7bb6468ff30dab943c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:35 +02:00
Tobias Hunger
533644290f Move DebuggerRunConfigurationAspect into Debugger
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:25 +02:00
Tobias Hunger
e474b6ed8f Demote debuggerrunconfigurationaspect
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:12 +02:00
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