summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/debuggerkitinformation.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Debugger: Add an macro expander for debugger engine typehjk2014-10-101-0/+1
|/ | | | | Change-Id: Ib16f3b410ea83f6a4687b03677c51fbec26165d7 Reviewed-by: hjk <hjk121@nokiamail.com>
* 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>
* Debugger: Move classes into their own filesTobias Hunger2013-10-281-96/+1
| | | | | Change-Id: I89853ffb4192b0da1f34d471e250d4ec32daa3da Reviewed-by: hjk <hjk121@nokiamail.com>
* DebuggerItem: Make sure DebuggerItems have an IdTobias Hunger2013-10-251-5/+1
| | | | | | | | | | | | | 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>
* Debugger: Fix the way to register/add new debuggersEl Mehdi Fekari2013-10-221-3/+3
| | | | | | | | | | | | | | | | 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>
* Debugger: Add upgrade path for 2.8 kit debugger settingshjk2013-10-171-0/+1
| | | | | | Change-Id: I1fd01d46127b2a1dc351c789c9ba537515baba0b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Rework detection of SDK-specified "auto" debuggershjk2013-10-171-3/+5
| | | | | | Change-Id: I173752a41da7b34d64cb7e3e423992be464fc73b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: Fix cloning of DebuggerItemshjk2013-10-161-7/+3
| | | | | | Change-Id: I1e16b09361bb7d3eab2bfc7b77da388c60d23f01 Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Refactor DebuggerItemManager classEl Mehdi Fekari2013-10-151-2/+61
| | | | | | | Task-number: QTCREATORBUG-10252 Change-Id: Ia8545fd0255f59290a6bab6e35ef1c082649f794 Reviewed-by: hjk <hjk121@nokiamail.com>
* Android: Fix debugger autodetectionhjk2013-10-101-1/+0
| | | | | | Task-number: QTCREATORBUG-10341 Change-Id: I197ae5745d5caba12bce3e148ada2a589ac7f9b3 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Debugger: Export Debugger::DebuggerItem to fix BlackBerry setuphjk2013-09-251-2/+49
| | | | | | | Task-number: QTCREATORBUG-10189 Change-Id: Icddd09a1a931371133a1d03ca8cf600e76295eac Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Kits: Simplify handling of sticky kit informationTobias Hunger2013-09-121-2/+1
| | | | | Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Don't add invalid items during validationhjk2013-09-051-38/+4
| | | | | | Change-Id: I3b6427ec038d61ea3166880ae51292f87f7b861b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Kit: makeSticky() -> setSticky(), allows for unsetting sticky bitDaniel Teske2013-09-031-1/+1
| | | | | Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* KitInformation: Make dataId and priority value membershjk2013-08-291-4/+0
| | | | | | | More in line with recent development. Change-Id: I38ad7dd0cb96080a9dc9cc3165e4fb7c78a736b3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectExplorer: Introduce per-kit debugger configuration pagehjk2013-08-291-28/+33
| | | | | Change-Id: I65c76f3ff43e1479075926c7e3fa460cca74d8fe Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kit: Provide interface to mark individual kit information stickyTobias Hunger2013-07-251-0/+2
| | | | | | Change-Id: Ic45aae21cb8b0f4e4fdd0dcf1009f127e489920c Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectExplorer/Kit: making toHtml() constFawzi Mohamed2013-02-041-1/+1
| | | | | Change-Id: I8a9be3cda84f5d00d29a8f5e101c004ea2bbc6ba Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Kits: Reduce magic while improving setupTobias Hunger2013-01-221-0/+2
| | | | | | | | | 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>
* KitInformation: Make validate work on const Kits and add fix methodTobias Hunger2012-10-121-1/+1
| | | | | | | | Make sure validate will not modify kits, add a fix method to do that when kits are loaded/added. Change-Id: Ib378af0f3470b2caf64177b35fca061089ac4523 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Adjust license headershjk2012-10-051-22/+21
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Yet another s/profile/kit changeOrgad Shaneh2012-09-281-5/+5
| | | | | | | Mostly variable names, one string Change-Id: I9d44cba8ade9266303fe7695b8bc93647710b71d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Profile -> Kit variable renamingOrgad Shaneh2012-09-111-5/+5
| | | | | Change-Id: I6cc06684134030bd527d9dcce21ad17938a56927 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Move debugger kit settings into a separate dialog.Friedemann Kleint2012-09-111-1/+7
| | | | | | | | | Change the DebuggerKitConfigWidget to contain a display label only. Add a Button with a menu for "Autodetect" and "Edit...". Change-Id: I8ec17966ef220c81fb8b145a61df4408d5950da9 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Add debugger engine type to configuration.Friedemann Kleint2012-09-051-4/+37
| | | | | | | | | | | | | | | | | 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>
* s/profile/kit/Tobias Hunger2012-09-041-0/+65
* 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>