Commit Graph

1041 Commits

Author SHA1 Message Date
hjk
adc9817671 Debugger: Remove some deprecated methods
Change-Id: I67254bb6d3d23e9fa9e121df0b3b923330cfe84a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-19 12:17:41 +02:00
Tobias Hunger
85b2017a69 TaskHub: Move code to be more conform with other singletons
Make methods static and add a instance() method for Signals/Slots.

Remove ProjectExplorerPlugin::taskHub() method and use the new
ones instead.

Change-Id: Ifae24ff19579fc524cbd61bddc826095c443adfa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-19 11:24:32 +02:00
Christian Kandeler
b055c0e506 Device support: Rename DeviceProcess to DeviceProcessItem.
We want to introduce a new class that has more right to that name.

Change-Id: I9535632e10872a97a8555e885a80c383bc5dcd2b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-08 12:24:40 +02:00
Tobias Hunger
5422b2c4da Introduce Project::projectFilePath()
Use it instead of retrieving this information from the document.

Change-Id: I809fcb2daf59021cf503c371a5d40d75d7448796
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-01 11:42:41 +02:00
Orgad Shaneh
71ff3a0a86 Debugger: Clear undo/redo stacks when debugging session is finished
Task-number: QTCREATORBUG-7645
Change-Id: I17df03c5765129c21f38df19ea90c04e937a7217
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-01 10:07:42 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 11:11:25 +02:00
Eike Ziller
fade19a9bf Move IEditor::createNew to IDocument::setContents
The method is for setting the contents, so it belongs to the document,
and should be named correspondingly.

Change-Id: I40363dc08f11268f530885b512e4a88e8b10d096
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 09:00:17 +02:00
Erik Verbruggen
62994a367a Debugger: give the qmlToolBar a parent.
Showed up in valgrind as a leak, when QML debugging was not used.

Change-Id: I8e378795727f0e2f297086ae73dab99b6a28de32
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 12:15:00 +02:00
Eike Ziller
871a8cd031 Work with documents instead of editors where possible in debugger
And where using editors is necessary, take *all* editors into account,
not a random set of what previously was called "original" editors (when
using splits).

Change-Id: Id6bbad08f3083b6744fc2edcf0b87ba504d3257b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-12 11:58:24 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Eike Ziller
8685ff8a28 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad
2013-07-03 16:55:27 +02:00
Friedemann Kleint
dea9672862 Fix translation context of "Attach to process".
Task-number: QTCREATORBUG-9712
Change-Id: Ib46e4c91a520044bfa9fb717edecee167b68076e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-02 09:38:14 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
hjk
78dc4ee112 Debugger: Add view menu to toolbar
Change-Id: I8783ce66d28626e9a484d6aa729fccd07bbda0b8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-25 14:53:34 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Christian Kandeler
9e5a9110ca SSH: Implement and make use of RFC 4256.
There is now at least one Linux distribution (openSUSE 12.3) that
disables the "password" authentication method in its default
sshd_config, while others allow it, but disable "keyboard-interactive".
This patch tackles the problem as follows:
    1) Implement RFC 4256 ("keyboard-interactive") and make this method
available in the API.
    2) In addition, the API offers to try both password-based methods
one after the other, until one has succeeded or all have failed.
    3) Dialogs continue to offer just the choice between "Password" and
"Key", as to not confuse users. Internally, "Password" uses the feature
described in 2).

Task-number: QTCREATORBUG-9568
Change-Id: Ic81bd5d2dc4b1332ea1a8be938c19811c21a9087
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 15:21:41 +02:00
Kai Koehne
cdfa382ebf QmlProject: Don't disable debug action based on debugger window language
If you loaded e.g. a .qmlproject file that had only C++ debugging turned
on the Start debugging action got disabled, and there were no ways of
getting it enabled again (short of reloading the project).

Anyhow, the logic to disable the debug action based on the current
debugger language is flawed, since triggering the action will actually set
the language.

Change-Id: I5827a39cafc7e5dd0b2f2b43f07774e64eace02e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-20 11:35:33 +02:00
Leena Miettinen
41411165ba Doc: use standard wording in \brief commands
QDoc does some magic with the \class and \namespaces
and \brief commands, so the following wording must be used:
"The xxx class yyy ..."

Change-Id: Id231f30e8464898b776888d5423523de404aae34
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-20 11:22:47 +02:00
hjk
e40308ab1b Debugger: Remove in-plugin dumper autotest handling
It's covered by tst_dumper nowadays.

Change-Id: Id6b91e5a4ad2ac2472d598c4f0ba4c95c334af6d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-07 15:48:43 +02:00
hjk
9155e14db2 Debugger: Allow continuing debugging when switching projects.
Change-Id: If99fc8dc7697eaef50ea7bf7656c0ce788201679
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-07 13:33:17 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
Christian Stenger
21c821806d Test: Correct path of loaded project for Mac
Change-Id: I91e0126b0f66e1635c6c1427d9f22842eeafcdd9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-30 14:02:48 +02:00
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
hjk
78cea9ee24 Debugger: Make kit parameter in fillParameters() non-optional
Change-Id: I1b4dde1a63c8e2eb030cab3580abed845b270631
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 15:34:47 +02:00
David Schulz
87e516fa71 Debugger: Add core function returning string list settings.
Change-Id: I03caaf59bf6d41845b3f68194701579d7383e638
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 14:42:28 +02:00
hjk
4ae9f3778f Debugger: Fix passing connection when starting from commandline
This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-27 13:01:20 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Daniel Teske
9f029d7acb Fix Breakpoint storing in session
Task-number: QTCREATORBUG-9253

Change-Id: Idf517286394796e516115009789e6ff7df527c91
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-07 18:59:08 +02:00
Aurindam Jana
aa93f25626 QmlDebugging: Attach to QML application
Specify project source directory and sysroot.

Change-Id: Ie9287ef4da023159b131e67de51ffc218c4d2a70
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-07 10:52:32 +02:00
Aurindam Jana
8fe5ac405e QmlDebugging: Set correct host when attaching to an application
Change-Id: I32030b5320f6de129af77fbde28cf7a4a048d9dc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-06 15:21:43 +02:00
Eike Ziller
b450b3071e TextEditors: Separate away methods that actually work on a document
Introduces ITextEditorDocument. This is part of a more general "use
documents instead of editors whereever possible". It will allow to move
to e.g. ITextEditor::openedTextDocumentContents() instead of
ITextEditor::openedTextEditorsContents().

Change-Id: I5ebceaa257a0d2c3e8ac4ac51b9b08b6faa42487
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-19 16:21:30 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
hjk
b5eac91b54 Debugger: Re-enable thread combo box for core files
This fixes a regression introduced after 2.5

Task-number: QTCREATORBUG-9110
Change-Id: I72450d7c6797910e789f78c7478fc7dd3d6f6228
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-11 18:05:19 +02:00
Tobias Hunger
ddafdf55de CppTools: Rename files to comply with coding standard
Rename ModelManagerInterface.(h|cpp) to cppmodelmanagerinterface.(h|cpp).
Rename TypeHierarchyBuilder.(h|cpp) to typehierarchybuilder.(h|cpp).

Change-Id: I035d833fd205d7460819bd0fb7031294359032f9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 11:43:22 +02:00
Tobias Hunger
ea23948efb CppTools: Use namespace CppTools consistently
There were quite a few classes using CPlusPlus namespace in the
CppTools plugin. Rename them and do some other small namespace
related coding style fixups.

Change-Id: I093fc1f3fc394fd9923e3f18d5f66522e288f21d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-08 13:21:31 +02:00
Tobias Hunger
533644290f Move DebuggerRunConfigurationAspect into Debugger
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:25 +02:00
Tobias Hunger
e474b6ed8f Demote debuggerrunconfigurationaspect
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:12 +02:00
Eike Ziller
96a5245d8e Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2013-03-26 13:10:09 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
2013-03-26 13:09:43 +01:00
Friedemann Kleint
92207c96b7 Clean headers in ProjectExplorer.
Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-26 12:37:29 +01:00
Daniel Teske
459655b42b DebuggerPlugin: Adjust to MessageManager api change
Change-Id: Iea8630ae08085fe71586a5e780193a0c0c955801
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-22 13:48:50 +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
hjk
a700ec1b9c Debugger: use Id::toSetting when writing settings
Change-Id: If3bbf526eee51aeb60f2fe377a432a14cf01e0eb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-21 17:38:19 +01:00
hjk
3824d90168 Debugger: Remove deprecated use of Core::Id(QString)
Change-Id: I8193e4d43c198674469d8d374bc66b7970b90f0a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-19 17:14:39 +01:00
Robert Loehning
dbeb36b03e debugger: Avoid failing assert in theId()
Change-Id: Ic5895a6c8f8402d4abf0d66ab334caa5815de7dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-19 11:18:58 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
2013-03-18 10:19:14 +01:00
Orgad Shaneh
14e35b5dc4 Client: Block until editor is closed
Change-Id: I06bd4425008103be3a4c8f64b6dff8f7df30c552
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-15 12:24:52 +01:00
Aurindam Jana
b35ca65801 Debugger: Enable/disable debug button
The debug button should be enabled or disabled after
checking if the project can be run in DebugMode.

Change-Id: I2700c1de290f89bae9456319c2e93857374838ed
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-13 12:58:40 +01:00
Friedemann Kleint
68cd15382d Fix Krazy warnings about includes/header guards in Debugger.
Change-Id: If547a0002d37710fac58c1a13bacc48cf531bed7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-12 12:49:48 +01:00
Friedemann Kleint
659470f940 Fix launching the debugger from the command line.
Delay parsing of parameters until the kits are loaded.

Task-number: QTCREATORBUG-8876
Change-Id: I091dfabb73649e3fe87308e5a5c6c4502b00fe66
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-05 11:48:10 +01:00