Commit Graph

4299 Commits

Author SHA1 Message Date
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
hjk
4622aba79e Debugger: Fix triggering display of threadnames
This is a recent regression introduced by the delayed python dumper
initialization.

Task-number: QTCREATORBUG-8615
Change-Id: I3b5dbe5b04c68cf873e3a2597edc60fe2888b3c9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-31 16:20:47 +01:00
Friedemann Kleint
2970a036d8 CDB: Use maxStackDepth and implement reload full stack.
Task-number: QTCREATORBUG-7320

Change-Id: I78bf8cf63fa892f2a6771911333c246839439bf4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 16:07:56 +01:00
Friedemann Kleint
72421c18c1 CDB: Pass settings maxStringLength and maxStackDepth to extension.
Change-Id: I602aa3758817026c8b4cbda1cc9fa9eff95fc691
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-31 15:48:31 +01:00
hjk
82ab15e403 Debugger: Avoid endless loop when setting breakpoint on functions
Change-Id: I3ead86ba50d1d68a46cdc58c06684b2ac8c091c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-31 11:59:15 +01:00
Daniel Teske
955bc3b98e DebuggerKitInformation: Remove unused member
Change-Id: I42aca6cca0f54e568b0448f6ca04676d8946a7c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 14:46:52 +01:00
Fawzi Mohamed
18fa486531 consoleprocess: support Terminal.app on mac
Distinguishes the process that starts the terminal from the stub
process, as on mac to support Terminal.app they are different.

Handle the stub not through the process that starts the terminal,
but through the local socket (on *nix).

Replace the blocking wait(...) in the main thread, with a nonblocking
wait in the signal handler when receiving a SIGCHLD, to leave the
main thread able to handle communication with creator.

This change allows the use of terminal emulator commands
that share a single instance or that fork.
So this is also the real fix for QTCREATORBUG-1633 on linux.

If creator crashes the stub and the debugged program live on.
This was done on purpose, it could be changed if considered better.

Task-number: QTCREATORBUG-6371
Task-number: QTCREATORBUG-1633

Change-Id: I4d4fb3a67b1987f4e46e2c603dcefe8c15152ad2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-29 17:56:59 +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
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
2013-01-29 15:52:36 +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
hjk
b6f187d0f2 Debugger: split editor related code off watchutils.{h,cpp}
This is now in sourceutils.{h,cpp} to make watchutils.{h,cpp}
better acessible to the debugger auto-tests.

Change-Id: Ie87e715bc7018ca190a460c37dfd19bc897059f0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-25 13:54:34 +01:00
hjk
794b41581b Debugger: remove isEditorDebuggable
It was returning 'true' unconditionally for a while.

Change-Id: Ia99bdb3c525641f757dacbba148b68d677f4d632
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-24 16:10:10 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach.
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-24 13:02:32 +01:00
hjk
63439a5f21 Debugger: move MI decoding to debuggerprotocol.{h,cpp}
Change-Id: I9d2eaf43b66f0db74ba2584157d6df8280d76652
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-24 12:22:31 +01:00
hjk
e52a35a239 Debugger: rename gdb/gdbmi.{h,cpp} into debuggerprotocol.{h,cpp}
The scope is a bit broader nowadays.

Change-Id: I9578da94f06df199be5668c1751fd7bfb37f1c5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-24 11:05:36 +01:00
Friedemann Kleint
ec2076c755 Fix lupdate warnings.
Change-Id: Idef345e12223cf6695ea5af8ee7fa1e51c72be0f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:51:54 +01:00
hjk
c08da42685 Debugger: fix loading of dumpers when attaching to running process
This was a recent regression trigger by delaying the dumper loading.

Change-Id: Ief9ad8ab21728ba8f1ad743e8b9a410655c47ae1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:47:46 +01:00
Tobias Hunger
f2122583da Kits: Reduce magic while improving setup
Task-number: QTCREATORBUG-8576
Task-number: QTCREATORBUG-8081

Change-Id: I9a6675a8ae97517f78bca026c4aa0edca82d606d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-22 16:02:31 +01:00
hjk
6dd8726a16 Debugger: use Id::{from,to}Setting when appropriate
Change-Id: I7b6d68d9c141c485ec27d6fc45f54ee2911b7349
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-18 12:33:27 +01:00
Fawzi Mohamed
e4eaf929dc namedemangler: move template implementation to the .h file
NonNegativeNumberNode<base>::mangledRepresentationStartsWith is used by
the tests, so moving that implementation to the .h file

Change-Id: I42267030dcbd9d128d5cc165a8d688a68354eb90
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 17:17:32 +01:00
hjk
fbb197655b Debugger: correct typos in comment
Change-Id: I3211a696c65f500b8e7d7c4ce394788773ce5713
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-17 17:02:35 +01:00
hjk
e2f86d9e48 Debugger: Speed up disassembly retrieval
This skips the case of "disassembling a function given an address"
with indeterministic time behaviour and and immediately falls back
to the fixed range version instead.

Change-Id: I90ec56198a7d767bcf0a9ffb030637c2ee5c617a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-17 16:59:34 +01:00
hjk
be48a3faff Use Core::Id for IOptionsPage::m_id
Change-Id: Id9d6cf28966eeb65775cf1f16f57773af5fb6bca
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-17 11:43:04 +01:00
Oswald Buddenhagen
65c169c80e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidrunner.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
2013-01-16 16:46:03 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Orgad Shaneh
b7ba74d80c Debugger: Update command-line arguments
Change-Id: I0d6a674766f4cb7c6e002125e91a3df940b1e1b9
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-15 18:02:56 +01:00
Daniel Teske
8e75e611a5 Move TextEditor::ToolTip to Utils
To enabled reuse from all plugins.

Change-Id: I1de68c8e6ed017d45f1248b2043f9611becc3b54
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-01-11 15:06:00 +01:00
Christian Stenger
17bf3e3d17 Debugger: Fix visibility of Debugging Helper Dialog
Task-number: QTCREATORBUG-8440
Done-with: David Schulz

Change-Id: Iccd252cc743df37216884cbc0e5a51c96ac382b4
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-11 13:01:39 +01:00
hjk
b36afdac3e Debugger: make variable format changes work with multi-selection
Task-number: QTCREATORBUG-7577
Change-Id: I9c9a5b40bfe88970d99ed855e4c912fc98f1fa11
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 16:01:36 +01:00
hjk
8a805c2e90 Debugger: Add "Reload Debugging Helpers" to Log Window context menu
Change-Id: I5059dbf73482236a677de8c004ab33aaef3d4cd6
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 14:37:40 +01:00
Kai Koehne
ff0ec4d798 Debugger: Fix compiler warning
Fix compiler warning about unused variable.

Change-Id: Icb1e6b7d144538fb971f67da75bf9f4e172a4dbf
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 12:46:59 +01:00
Orgad Shaneh
25f05f7c9e Fix qbs build
Change-Id: Ie04a3bddf7ccd6fed63fdcad90a0a0e33ff86f2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-09 22:44:13 +01:00
hjk
885f8b34cf Debugger: Move python initialization after first stop
This enables access to object-specific plain gdb pretty printers
which are not available before startup.

Change-Id: Icc8cbec177825d4d1adb1957a618abb33cbbf319
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-09 17:26:36 +01:00
hjk
2a0bb34911 Debugger: split fixCppExpression into some common and some cdb part
Task-number: QTCREATORBUG-8446
Change-Id: I79abc7f75779db15bd8700c085b9cd57411bb2e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-09 16:02:46 +01:00
Friedemann Kleint
78d134cdcd Debugger: Add Image viewer with color picker and context menu.
Change-Id: I31673da5ba85e87c9819059a9e6806b5deecff1e
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 17:16:28 +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
Ryan May
577fe8a49f Debugger: Make tabs in separate view closable.
Refactor the separate view from directly using a QTabWidget to a subclass
so that the necessary signal can be hooked up.

Change-Id: Ibc2653d554882a36a85162708021422843057bc1
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-01 01:09:31 +01:00
hjk
cbf75f676a Debugger: de-noise
Change-Id: I48c9b1353d80ebd85c81aa8a03d0be200781122a
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-30 12:55:52 +01:00
Friedemann Kleint
033f211a10 Windows compile fix.
e8b5c6dfcca3fc139049136b42459e7840efed7 :
Provide terminal emulator functionality in ConsoleProcess for
Windows as well.

e833b794b3 :
Use Core::Id().

Change-Id: Idad2bd2180e9a5dd2d1266496e340726435835d3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-29 20:55:03 +01:00
Friedemann Kleint
2344456b3f CDB: Support for displaying QImage.
Change-Id: Ic1a4a0e6767a0cecb1fd869bbcfd9673854631aa
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-29 20:05:45 +01:00
Friedemann Kleint
99f542354a CDB: Enable "Separate Window" format for standard strings.
- Always retrieve memory for std::strings.
- Enable type format.

Change-Id: I7bd00adbbeff0c4cc380b3ec078df408440302b4
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-29 20:05:32 +01:00
hjk
78beacd7b4 Use Core::Id for IOptionPage::category
Change-Id: I63433edd9118a7aa4ecaef28f40bfc729d90f512
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-29 19:10:59 +01:00
hjk
e833b794b3 Use Core::Id in ICore::showOptionsDialog
Change-Id: I3865fde2347d687a7dee76dd5ca62db69cc4dd04
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-29 19:04:30 +01:00
hjk
82f9de4af0 Use Core::Id for settings category in showWarningWithOptions
Change-Id: Ie296816c271efabfb7a046c176bc33ebde6f6454
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-29 19:03:21 +01:00
Ryan May
45cd2d1e8f Debugger: Set current tab in separate value display
As widgets are added and deleted from the tab widget, they can end
up in almost any order. As a result, when the window is raised, the
current tab does not necessarily reflect an item currently in the
watch view. Instead, make a tab the current one as it is added,
ensuring one of the currently relevant values is displayed by default.

Change-Id: Ia2d2eb60c844a008f8086820564dd20389ce519b
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-29 13:09:03 +01:00
Friedemann Kleint
9043898f6f Fix crash in context menu for edit formats.
Ensure type is in range.

Change-Id: I850eab05d365fca4fbf86ca3e7753e117d3f2f2a
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 19:26:14 +01:00
Friedemann Kleint
82b781f5a7 Auto-detect Endianess of image data by looking at width value.
Change-Id: I403fe7dcf841129e4c24b2c2787f58aa94540c6e
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 19:25:42 +01:00
Friedemann Kleint
7bc0818d7a Fixes to edit format handling.
- Close window after last tab has been removed.
- Remove type name from tab title (results in too-long tab titles
  for templates).

Change-Id: If4b55423261ed4992b8a7e983704006fdda86843
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 19:21:30 +01:00
Orgad Shaneh
d0f9d0c136 BinEditor: Fix Ctrl+Home/End for files
Doesn't seem to affect memory editor

Change-Id: I9cc21744d0dcc5fe8cf2685c61f8e71f87af3961
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 16:44:34 +01:00
Friedemann Kleint
5f04706a88 Implement basics for edit value handling in CDB.
- Add routine for formatting edit values.
- Optionally store memory in SymbolGroupNode (along
  with special info) to be able to re-use it for
  edit values using a simple convenience class
  MemoryHandle.
- Prototypically implement QString and QByteArray / Qt 5.

Task-number: QTCREATORBUG-8344

Change-Id: I6d2cac7a1e9ac48e94335142c41dc1bfb984c515
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-12-21 15:41:39 +01:00