feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
33,037 Commits 108 Branches 368 Tags
429a26b3cd6fc481b319e6cfd2e8a481f3a80f92
Commit Graph

55 Commits

Author SHA1 Message Date
Tobias Hunger
79af2d969f Debugger: Do not change kits in the options page on debugger changes 
Change-Id: I577c797d98717ec0cf91214690ca5d36d2a26ccf
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-11-01 10:40:41 +01:00
Tobias Hunger
b17e8e3061 Debugger: Rewrite logic to use signals on DebuggerItemManager 
Change-Id: I82e1cd3cca9cc2d79366e1af054640dadebf7871
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-28 17:55:27 +01:00
Tobias Hunger
ab8999832a Debugger: Move classes into their own files 
Change-Id: I89853ffb4192b0da1f34d471e250d4ec32daa3da
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-28 17:50:49 +01:00
El Mehdi Fekari
7079a835a0 Debugger: Add new debuggers from option page 
The asserts should be moved from the addDebugger() method
which is called to add an 'empty' debugger when adding new one
from the option page.

Change-Id: Ic402db514d1e97f5fdc12d9bb9070bf29b2ab354
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-25 15:51:04 +02:00
Tobias Hunger
c2705f1595 DebuggerItem: Make sure DebuggerItems have an Id 
The default constructor now sets an id on debuggerItem. fromMap was
removed and a new constructor (taking a const QVariantMap &) was
added in place of that.

There are no more friends on the DebuggerItem class since those were
only necessary to make sure the item has an Id when it gets added.

Change-Id: Ia1a6c9ffea67a8e0a1e5685ef93f67df8686d4c9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-25 14:12:56 +02:00
El Mehdi Fekari
36e6a70505 Debugger: Fix the way to register/add new debuggers 
DebuggerItemManager::registerDebugger() should return the id
of the added debugger in order to use it when setting a kit's debugger
(addDebugger() creates and adds a copy of the passed
debugger object with a unique id).

The DebuggerKitInformation::setDebugger() method should set only already
existing and registered debuggers.

Task-number: QTCREATORBUG-10436

Change-Id: Icdcd1ed92aafe9eda44abf831aa9983dd6801980
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-22 20:14:14 +02:00
Tobias Hunger
b2f27649a2 DebuggerKitInformation: Make setup() handle new kits 
Those return a invalid QVariant, so handle that explicitly.

Change-Id: I50726552aeb76d21032c119c5ea2db48e6d88e8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-18 13:26:15 +02:00
Tobias Hunger
df83d1574d DebuggerKitInformation: Invalid ids are ok 
Invalid Ids are used to for "No Debugger", so do not try to fix
those values.

Change-Id: I141f969524e1faffa66a22c2a08ef18ec4d7fc23
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-18 13:25:49 +02:00
hjk
d16076e59f Debugger: Add upgrade path for 2.8 kit debugger settings 
Change-Id: I1fd01d46127b2a1dc351c789c9ba537515baba0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-17 16:46:43 +02:00
hjk
16cf6177d8 Debugger: Rework detection of SDK-specified "auto" debuggers 
Change-Id: I173752a41da7b34d64cb7e3e423992be464fc73b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-10-17 16:30:15 +02:00
hjk
659ee09ce4 Fix association of kits with auto-detected debuggers 
Task-number: QTCREATORBUG-10379

Change-Id: I515da97e6f6ac079590c9d91317ed32b5194a12a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-10-16 11:53:13 +02:00
hjk
c24361901c Debugger: Fix cloning of DebuggerItems 
Change-Id: I1e16b09361bb7d3eab2bfc7b77da388c60d23f01
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-16 10:28:33 +02:00
El Mehdi Fekari
a918b47869 Debugger: Refactor DebuggerItemManager class 
Task-number: QTCREATORBUG-10252

Change-Id: Ia8545fd0255f59290a6bab6e35ef1c082649f794
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-15 18:06:27 +02:00
hjk
dd1e51076a Android: Fix debugger autodetection 
Task-number: QTCREATORBUG-10341
Change-Id: I197ae5745d5caba12bce3e148ada2a589ac7f9b3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-10 19:50:18 +02:00
Friedemann Kleint
da63065337 Fix some tr()-messages in the Debugger plugin. 
Change-Id: Ie3145e90066432074fc44c77eeee027f57edfcf4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-10 13:36:41 +02:00
Orgad Shaneh
895caa7544 Debugger: Remove unneeded include 
Change-Id: Id350ef638b3db769ba07abba1dcddeec05eff713
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-30 16:08:27 +02:00
hjk
394045b218 Debugger: Export Debugger::DebuggerItem to fix BlackBerry setup 
Task-number: QTCREATORBUG-10189
Change-Id: Icddd09a1a931371133a1d03ca8cf600e76295eac
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-25 14:45:04 +02:00
Tobias Hunger
d7674e45c2 KitInformation: Delete subwidgets in destructor 
Change-Id: I7e0a6d457aa26748758b6402955c81eae2c94782
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-09-17 10:13:26 +02:00
Tobias Hunger
747b8d48da Debugger: Remove dead code 
Change-Id: Id626cd25efec5fd00ccd87fac4de429c9cdabf8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-13 10:32:01 +02:00
Tobias Hunger
f1f1f65f7c Kits: Simplify handling of sticky kit information 
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-12 18:46:20 +02:00
Friedemann Kleint
f728285eda Fix lupdate-warning in debuggeritem. 
qt-creator/src/plugins/debugger/debuggerkitconfigwidget.cpp:140:
Qualifying with unknown namespace/class ::DebuggerItem

Change-Id: I470a5732cc9f030905ea666cd0bc30a2379d561c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-11 16:49:09 +02:00
hjk
cd17a0e400 Debugger: Don't add invalid items during validation 
Change-Id: I3b6427ec038d61ea3166880ae51292f87f7b861b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-05 10:52:51 +02:00
Friedemann Kleint
11a4a6af58 Add tr()-functions to DebuggerItemConfigWidget. 
Change-Id: I437ab8ba95ccdddf7693d98f9aff400b03ad79d4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-04 16:24:12 +02:00
Daniel Teske
f214011d33 Kit: makeSticky() -> setSticky(), allows for unsetting sticky bit 
Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-03 12:18:29 +02:00
hjk
5c62a0f944 Debugger: Don't make engine type appear editable 
It is determined by the chosen debugger, no need for a combo box.

Change-Id: I1e278469bcd861a05eb102e94accee4dfc222b62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-09-02 15:38:47 +02:00
hjk
7f3a156778 Debugger: Use correct path separators in display on Windows 
Change-Id: Idef95d15bb78c7fbda8afac4f264e23011d63393
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-09-02 15:38:40 +02:00
hjk
513b884dfc Debugger: Silence warning on empty debugger settings in legitim cases 
Change-Id: Ibaa830f615a3d739a198a9550cd955dc9151c009
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-08-30 14:13:05 +02:00
hjk
f33a9813b1 Debugger: Fix configuration upgrade path from 2.8 
Change-Id: I67547dfad529ebb918741721b691c39bb0e69720
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-30 12:44:33 +02:00
Christian Kandeler
32d98862e7 Debugger: Fix argument placeholder in string. 
Change-Id: Ie22bc9f4b4b26099d2b9af07379629b2ec31c469
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-30 10:49:18 +02:00
hjk
80194f4ef4 Debugger: Fix compilation with Qt versions < 5.2 
Looks like not everyone updated yet...

Change-Id: Id0abe512ba22738953ead288edd84b3778fc170d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-08-29 18:27:58 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics 
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:45:25 +02:00
hjk
c10ae974eb KitInformation: Make dataId and priority value members 
More in line with recent development.

Change-Id: I38ad7dd0cb96080a9dc9cc3165e4fb7c78a736b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:26:02 +02:00
hjk
36227d5c3a ProjectExplorer: Introduce per-kit debugger configuration page 
Change-Id: I65c76f3ff43e1479075926c7e3fa460cca74d8fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-29 16:12:08 +02:00
Tobias Hunger
fbda476940 Disable autodetection when the debugger is set up by the SDKtool 
This is save now, since the SDKtool will have set up a proper debugger
and if it did not fill in one, then the whole widget will stay editable,
even for auto-detected kits.

Task-number: QTCREATORBUG-9529
Change-Id: I92e89f74a1dd27705d34f77d19d521c69067eb2d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-20 08:18:10 +02:00
hjk
fa09ad8f15 Debugger: Make Debugger path configuration dialog a bit wider 
Change-Id: Iaf3202b70fdef2508259287f7c275a96aaf8f51d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-06-10 18:47:29 +02:00
Tobias Hunger
1ca9bab242 Kit: Only make SDK-set KitInformation read-only 
Leave the rest user-editable.

Task-number: QTCREATORBUG-9030
Change-Id: I77c9ff980dd9a497bff53ee04dae7e771e4e7e82
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-07 16:39:29 +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
Daniel Teske
a5d9ed6fe7 DebuggerKitConfigWidget: Fix layout for long paths 
Change-Id: Ic21ef04417bc6ca10493fea0ee45e9b2524a10a3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-20 17:06:22 +01:00
hjk
12428b8536 Debugger: More visible buttons, less clicks in DebuggerKitConfigWidget 
Change-Id: If19c3640d40b1af8df6316b9bcb17e99020bee15
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-20 14:48:10 +01:00
Daniel Teske
af820b73c7 DebuggerKitInformation: Use Eliding Label 
The path to the debugger and gsbserver can get long. This prevents
scrollbars in those cases.

Change-Id: Ic8c22d764ce9d5d798ea3c8d2a9f638d51a30351
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-02-11 11:46:09 +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
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
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
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
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
 2012-12-18 17:42:04 +01:00
Friedemann Kleint
3247ecf758 Replace dead link to Debugging Tools download by Wiki link. 
Change-Id: I26d227464ae25edf92dc06f1c43cd0188b084132
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-17 13:46:00 +01:00
hjk
5dfdf75efc KitManager: spacing in dialog 
Change-Id: I243de278cd964c9aa51e7ff091a2c33e8043a562
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-11-16 16:33:50 +01:00
Tobias Hunger
f88636e613 Kit: Improve the options page 
* Update warning icon as changes happen
* Make clone clone the current settings, not what used to be there
  before changes were made
* Make sure the edited entry is visible in list view
* I find the KitModel much easier to understand now

Task-number: QTCREATORBUG-7862
Task-number: QTCREATORBUG-7803
Change-Id: I124c2e5a96cea7386896084e1027ba79a8be20b7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-16 12:04:37 +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