We have many buttons that open the options dialog, and many of these use
different terms.
Change-Id: I073fe2a23569c6f4174a2fb6567359c89cb2427c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
DebuggerKitConfigWidget::onDebuggerRemoved() is erroneously calling
updateComboBox() with the id of the removed item, which resets debugger input
for all other existing kits that are using valid exiting debuggers.
Task-number: QTCREATORBUG-10484
Change-Id: Ib989fdccfc87386785c7ca95ded860499ac2b98c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
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>
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>
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>
Those return a invalid QVariant, so handle that explicitly.
Change-Id: I50726552aeb76d21032c119c5ea2db48e6d88e8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
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>
It is determined by the chosen debugger, no need for a combo box.
Change-Id: I1e278469bcd861a05eb102e94accee4dfc222b62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Looks like not everyone updated yet...
Change-Id: Id0abe512ba22738953ead288edd84b3778fc170d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
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>
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>
#!/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>
