summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/debuggeroptionspage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge DebuggerItemManager and DebuggerItemModel datahjk2017-01-161-527/+0
| | | | | | Change-Id: I400fe94316433c538f82badde12ad704d722d730 Reviewed-by: James McDonnell <jmcdonnell@blackberry.com> Reviewed-by: hjk <hjk@qt.io>
* Core: Make IOptionsPage::categoryIcon a Utils::IconAlessandro Portale2016-09-201-1/+1
| | | | | | | This is necessary for themable + HighDPI icons in the options dialog. Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae Reviewed-by: hjk <hjk@qt.io>
* Move icons to UtilsUlf Hermann2016-08-051-2/+0
| | | | | | | This way we can use them from libraries, not only from plugins. Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Debugger: Use a StandardRunnable for the debugger processhjk2016-08-041-14/+29
| | | | | | | | | | One step further to separate the debugger environment from the inferior environment and to make it possible to configure a working directory. Guessing one from the inferior's working directory is not always a good idea. Change-Id: I33d139c0f228ec0870556b82bc6aecca0a8e62d6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Streamline TreeModel APIhjk2016-07-271-3/+3
| | | | | | | | | | | | | | The LeveledTreeModel case is general enough to cover the UniformTreeModel case, so merge them and rename to TreeModel. The former TreeModel is now BaseTreeModel. BaseTreeModels should not be instantiated directly, a tree model with non-uniform basic items is available as TreeModel<>. Done-with: Eike Ziller <eike.ziller@qt.io> Change-Id: I64a65617ab68c0cde39cf65f4bc092ef808ee6fb Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TreeModel: Introduce a destroyItem() convenience functionhjk2016-07-061-1/+1
| | | | | | | Shorthand for delete takeItem(...). Change-Id: Icb7b60e5c19aa0d21650eefff65f7eb55e9f90b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TreeModel: Re-order template arguments for tree levelshjk2016-06-241-1/+1
| | | | | | | | | More natural and easier to extend to use parameter packs later. Adjust users. Change-Id: Ic167196cc969d18bb1615084397e884f769d1e85 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Debugger/Utils: Remove TwoLevelTreeModelhjk2016-06-171-6/+5
| | | | | | | It's well covered by the more generic Utils::LeveledTreeModel now. Change-Id: I3982ad39a64742b0a0a59433024457db3808bfc7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Decorate root items in debugger and cmake options pageshjk2016-06-151-1/+0
| | | | | | | More consistent with Kits, Qt versions and Compilers. Change-Id: I16bb497a9fb17f271ffbf89e746d478b3aecb6a9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TreeModel: Take responsibility for some of the castinghjk2016-05-301-7/+6
| | | | | | | | | | | | | | | | | | | | This adds a templated layer on top of TreeModel that can specify item types for the top three layers in the model, relieving user code from some of the previously necessary type casting. Two common setups get an extra layer with convenience functions on top: TwoLevelTreeModel for two-level model with a first level of static headers and a uniform second level, and UniformTreeModel where all non-root nodes are the same. "Untyped" plain TreeModels are still possible. The walkTree() feature and untyped iteration in the base TreeItem and TreeModel is retained for now to ease transition in downstream modules, but is planned to be removed soon. Change-Id: I67d75a1a4e18e8f254dbfb458db03510d8990d8b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* TreeModel: Rework tree iterationhjk2016-05-121-2/+2
| | | | | | | | | | Use function objects to apply directly during a depth-first walk of the tree instead of faking a flat container of tree nodes. Less code, and allows even some non-const operations. Change-Id: I804ab11df358fe937b40809cbcb772e6f3ff8dc5 Reviewed-by: David Schulz <david.schulz@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Debugger: Use PathChooser::pathChanged() signal in some places.Christian Kandeler2015-12-091-1/+1
| | | | | | | | Instead of PathChooser::rawPathChanged(), because the associated slots use PathChooser::path() rather than PathChooser::rawPath(). Change-Id: Idcf0709583ccf285d07f45b2b3007951d918fb04 Reviewed-by: hjk <hjk@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-2/+2
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Debugger: Mark bad debuggger entries with an error iconhjk2015-09-071-0/+11
| | | | | Change-Id: If3f7ab4ea015be6f580f748f9d0ee19c608a0239 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Utils: Rename PathChooser::changed() signal.Christian Kandeler2015-09-031-1/+1
| | | | | | | | | The name is overly generic, particularly with a pathChanged() signal also present. Rename to "rawPathChanged", which adequately describes the semantics. Change-Id: Ia62b8b0a97a794cb6d5ad6b8ce0abcd36b5f5cdb Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* TreeModel: takeItem should return the itemEike Ziller2015-06-101-2/+1
| | | | | | | | The usual Qt API for "takeXyz()" methods is to return the item that was "taken". Change-Id: Ie144051801487a301b3f13e2857735b65f58150b Reviewed-by: hjk <hjk@theqtcompany.com>
* TreeModel: More API cleanuphjk2015-04-221-2/+2
| | | | | | | | | | | - introduce topLevelItemCount (similar to QTreeWidget) - squash untypedTreeLevelItems() - rename removeItems() to clear() - rename removeItem() to takeItem() - rename treeLevelItems<> to itemsAtLevel<> Change-Id: I0f1bb4110f7687b20da3d92e3d943858645a9fa2 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* TreeModel: API cleanuphjk2015-04-221-2/+2
| | | | | | | | | - rename index{From->For}Item - rename item{From->For}Index - remove ununsed setColumnCount Change-Id: I1cce9657e476dd1e8ffa9f7cdb2e646fab6884ab Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Fix missing of some translationsSergey Belyashov2015-03-241-0/+1
| | | | | | | Task-number: QTCREATORBUG-13649 Change-Id: I69f78b3b8d2366003bfce81a2afba0068e716d22 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.3' into 3.4Eike Ziller2015-03-051-1/+1
|\ | | | | | | | | | | | | Conflicts: src/plugins/debugger/debuggeroptionspage.cpp Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
| * Replace old qt-project.org wiki with wiki.qt.iov3.3.2Sergio Ahumada2015-03-031-1/+1
| | | | | | | | | | Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Debugger: Add some expandable macros to Debugger options pagehjk2015-03-041-7/+5
| | | | | | | | | | | | | | | | | | | | | | New %{Debugger:Name} for global use, %{Debugger:{Type,Version,...}} for expansion within the name. Also re-initialize from file if the saved version is empty (e.g. if the debugger was registered before the version field was present) Change-Id: I45568d78147597b30074a2ce4ddcf569bce15192 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Clean exported headers of the Debugger plugin.Friedemann Kleint2015-02-261-0/+1
| | | | | | | | | | Change-Id: I70ca6773e0f6aa6d80a441f8920d7f5d2418e1bf Reviewed-by: hjk <hjk@theqtcompany.com>
* | Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Debugger: Remove unneeded qualificationsOrgad Shaneh2015-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I1aa1a2b6ccbafeb1a8f3053fffa39b3f96992591 Reviewed-by: hjk <hjk@theqtcompany.com>
* | TreeModel: (Partially) separate header data from root itemhjk2015-01-211-6/+3
| | | | | | | | | | | | | | | | Full separation does not seem possible as QTreeView assumes all items to have equal column count. Change-Id: Ia260924fe13ea62789923af8484f9838295355b6 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | TreeModel: Add model pointer to TreeItemhjk2015-01-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | ... and use the items themselves as main entry point for item related operations. With non-uniform tree items it's easier to have item specific functionality directly in the item implementation instead of the model. Change-Id: I4e9b7db98d16b91ddef81917417691129bb83621 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Debugger: Take advantage of new tree iterator in option pagehjk2015-01-121-25/+6
| | | | | | | | | | Change-Id: I1a8e065cfaa57b49c852a3a1d67149447d4d87b2 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Debugger: Display debugger type in debugger configuration detail pagehjk2015-01-071-21/+18
| | | | | | | | | | | | Change-Id: I24432af08db8ead2a2b91059e795445e654ac5cd Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Debugger: Rework debugger option pagehjk2015-01-071-171/+312
|/ | | | | | | Use Utils::TreeModel internally, simplify code. Change-Id: Ie5c28519d5c23441fcd6b4fbff470cc70a92ee97 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* Debugger: Display parsed gdb version in build&run debugger listhjk2014-10-161-2/+10
| | | | | Change-Id: Ie7ec35f2f282f7f5ed527253c64c19e2b9347b18 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Do not use deprecated Qt functionality.Christian Kandeler2014-08-291-3/+3
|/ | | | | | | | | | | | | | | Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Unify read-only path choosers in Build & Run settingsOrgad Shaneh2014-07-031-1/+1
| | | | | Change-Id: I56725255380eed83de6dd1c0f07d4b6e63e48b75 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: No soft-asserts when clicking on "Manual" or "Auto-detected"Tobias Hunger2014-04-091-22/+35
| | | | | Change-Id: I09720054c4fbec842d2d04571fd2213a67f46095 Reviewed-by: hjk <hjk121@nokiamail.com>
* Utils: Compile winutils on all platformhjk2014-02-201-5/+1
| | | | | | | ... and simplify "user" code. Change-Id: I2dfa402f25ab83f1ab80adc0ac508e8383c69641 Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Preferences: Add default implementation for filteringEike Ziller2013-12-101-63/+56
|/ | | | | | | | | | | | | The default "matches" method now takes the widget and looks for all child labels, checkboxes, push buttons and group boxes. Because of that, the former "createWidget" method can be called multiple times without creating a new widget (-->widget()), and the "finished" method must ensure that the created widget gets deleted, since not all widgets that were created are added to the UI anymore. Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Reset engine type and ABI for non-existing commandsTobias Hunger2013-12-041-0/+3
| | | | | Change-Id: I53bdb26ea4e48d59b4623076da9cdb4ff499c3e1 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Do not lose the engine type in the debuggeritemmodelTobias Hunger2013-12-041-0/+5
| | | | | | | | | Have the DebuggerItemConfigWidget remember the engine type (even though it does not display it), so that it can write that information back into the model later. Change-Id: I1ed0d6a8d3750696a7eb5c453179acc282b78ce4 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Do not warn SOFT_ASSERT when no debugger is selectedTobias Hunger2013-12-041-1/+3
| | | | | | | | Do not not try to update the debugger if none is actually set. This avoids triggering a SOFT_ASSERT in the debuggeritemmodel. Change-Id: I646e251f58d6e25f1a88bddc142d953f94522084 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Prevent overwriting of pre-defined Abi valueshjk2013-12-021-28/+44
| | | | | | | | | | | | Todo: Add a button to rescan ABIs to UI after UI freeze. Currently you have to change the debugger command and then change it back when replacing a debugger with a debugger for something else in place. Task-number: QTCREATORBUG-10755 Change-Id: Id3cf1da3f198b60e6c538e5478b11f1d6d379ff9 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: Small cleanupTobias Hunger2013-11-131-5/+2
| | | | | Change-Id: I8586c1ae6f63edd75f8392a8e524e8197a7a72e8 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Keep changes on options pageTobias Hunger2013-11-121-4/+23
| | | | | | | | | | | | Keep changes on options page when switching between different debuggers. Only apply those changes on "Apply" and "OK", but do not loose them till those buttons are pressed. Change-Id: I4c4c583e7438802782b31bbfa92c5c09b51d824a Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: Disable 'Remove' button for the category headershjk2013-11-121-1/+1
| | | | | Change-Id: Ice56ff3291411f4c740af3cc812313ddb99d7d71 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: Added and cloned debuggers have identities, too.hjk2013-11-121-0/+4
| | | | | | | | Also, be explicit about there non-automaticness. This fixes a regression introduced in 574771. Change-Id: I23a63fdc6698006e03b6bbc46a2cb444f70fc025 Reviewed-by: hjk <hjk121@nokiamail.com>
View Lorry Controller Status