Commit Graph

73 Commits

Author SHA1 Message Date
hjk
6e7f07c37a Debugger: More modernization
New connects, some auto.

Change-Id: I768637aae9cbb0a62e9082e56141f212022d8220
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-27 12:19:25 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
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
2015-02-12 17:29:21 +01:00
hjk
f1c5889e77 Debugger: Some code modernization
Qt 5 signal/slot, a few auto.

Change-Id: Ia17f1b3dcd41dfe0a373c14e7c1d34d210d084f1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-12 15:14:55 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
hjk
56a5ac367b ProjectExplorer: More direct update of runconfiguration data
The signal is not needed.

Change-Id: I6dd059fee64438da65cc9a32d42ab0e451763c86
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-12-15 12:24:13 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Christian Kandeler
2a6491233c Fix behavior of debugger run widget.
The logic checking the other check box if the only checked one is being
unchecked was faulty, only updating the UI but not the actual state. As
a result, both C++ and QML were switched off, resulting in interesting
behavior when starting a debugging session.

Change-Id: Ifd61f7080ad70f816fa80b416f8594f057c299d4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-02 11:40:02 +02:00
Kai Koehne
ee3d38c16f Do not fully qualify types in ProjectExplorer namespace
Rely on using namespace ProjectExplorer that got introduced in
a previous commit.

Change-Id: I83cfc7387d8e5329b588d6d841cd9c2322270363
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-03 14:51:44 +02:00
Kai Koehne
7ca474b2c8 Update debugger language aspect in run settings when qmake step changes
When QML language debugging hasn't been set to a fixed state yet by the
user try to find a qmake step to decide whether to enable QML debugging by default
or not.

This is a hack, breaking the separation between qt build steps and debugger
run settings. However, adding a generic project infrastructure for this specific
use case is probably overkill...

Task-number: QTCREATORBUG-11474
Change-Id: Ib65c8474b9b7ec187769c209531ff56bc8293cde
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-31 17:16:50 +02:00
Kai Koehne
70f51fddd8 Debugger: Keep auto setting for debugger language when widget is shown
Do not hard code the debugger languages when the widget is shown the first
time (through the toggle() signal). React to the clicked() signal instead.

Change-Id: I1ee29a30d23eb9c7faead92c50552c1abf9c7792
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2014-03-27 12:10:20 +01:00
Friedemann Kleint
a471d3ae3d Debugger: Do not enable QML-debugging by default for projects using C++.
QML-debugging is rarely desired for C++ projects and causes warnings
about timeouts from the QML debugger not being able to connect.

Change-Id: Ide3e870a40b49deae24d3d88ea4973dd45d83e75
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-21 16:20:59 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
hjk
20d7d5e5b7 ProjectExplorer/Analyzer: Merge RunConfigurationAspects
The Analyzer implementation is now simple and still generic enough
to serve as general base.

Change-Id: I050a21919bf128929b77a64da1f46d157691d849
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-16 16:20:45 +02:00
hjk
cd460a3638 RunConfigurationAspect: Streamline data serialization
Change-Id: I6f49dd9eeff53eafc51bd5238ca655437df12111
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-13 13:18:42 +02:00
hjk
5fa7b60b97 Analyzer: Cleanup settings handling
More flexible, less over-engineered this way.

Change-Id: I3e224a6be85d3a187056d79fd506e8cf6a32c8a9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-12 12:39:54 +02:00
Kai Koehne
d5b48c0c92 Debugger: Only enable C++ language if project says so
Fix a regression from 2.7: A new .qmlproject did also have C++ enabled
as a debugger language by default. Instead of reviving the old, hacky
logic from 2.7 that directly manipulated the aspect object,
the aspect now checks for the actual project language, along the logic
of the QML language check.

Change-Id: I77c9323fd59079c42874dadf4dc54b9991204d9d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-06-10 12:38:41 +02:00
Kai Koehne
acf72893c4 Debugger: Don't check for QML language before project is parsed
Checking for QMLJS in the ctor of the aspect always returns false
for qt4project, since the project hasn't been parsed yet.

Change-Id: I41ce057bda4a1f2cb700e655645eae627990f3be
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 13:59:26 +02:00
Aurindam Jana
f512deb52a DebuggerAspect: Show both Cpp and QML debug check boxes
Change-Id: Ice552b9ed78ee7fdc9950b78d042f0f6a59d2657
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-24 12:31:31 +02:00
Aurindam Jana
23be3df051 DeviceSupport: Add canAutoDetectPorts() method
Use case: Devices such as Desktop device can
automatically choose an available port.

Change-Id: I6515425da3ae861b62d103885e2fde0e542d21d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-18 13:58:28 +02:00
Tobias Hunger
7d163a079d DebuggerRunConfigurationAspect: Update based on project languages
Update when the list of languages in a project changes.

Change-Id: I2ed1089b8c7a6358b1c398d388b8ad2143ec432e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-10 10:34:47 +02:00
Tobias Hunger
ace6829742 DebuggerRunConfigurationAspect: Suppress widgets as necessary
Suppress widgets of the DebuggerRunConfigurationAspect widget as
required.

Change-Id: I4e384d4e725bd95bea51465e28e26ece3e2f5cc8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:48 +02:00
Tobias Hunger
fd1f284892 RunConfigurationAspects: Move method to create config widget
Move the method used to create a config widget for a
RunConfigurationAspect from the RunControlFactory into the aspect
itself. This allows for aspects that are not bound to any factory,
which is what I eventually want to use to hold the environment for
run configurations.

Change-Id: Icceb5f44ca9eb63a87b9c7bb6468ff30dab943c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:35 +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