Commit Graph

52 Commits

Author SHA1 Message Date
Alessandro Portale
5915779e81 ProjectExplorer: Make the Options/Kits Category icon themable
Change-Id: I70c3fffd11b217937d6a85e88da1de688031b8e0
Reviewed-by: hjk <hjk@qt.io>
2018-02-28 18:36:00 +00:00
hjk
1b87d19a64 Debugger: Modernize
Mostly nullptr instead of 0, but also a few bits of collateral damage.

Change-Id: I921991272aca921dcdecf302dfff3716e79dfc24
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-01 10:28:54 +00:00
hjk
5afab6f018 ProjectExplorer: Create and populate 'Kits' settings category
Kits are a central concept and structure in anything build and run
related in Creator, their organization is crucial for the functionality
of Creator and deserve to be emphasized over other, often more cosmetic
settings.

This is the first step of two, the second step would be moving
the Device (list) page also in this category, possibly after some
reorganization in the Device category.

Change-Id: I4abc89472d0575c691fc9e5051397833126e5456
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-24 16:35:39 +00:00
Robert Loehning
9e066c7b17 Move HTML out of translated strings
Change-Id: I4664427086619f33e9a882eb3f0a5f2f52e1b42a
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-24 10:18:28 +00:00
Eike Ziller
f42ea09b74 Do not construct settings/resource paths from QSettings object
These paths are controlled by ICore.

Add ICore::installerResourcePath() to replace constructions with
settings(SystemScope)
Replace constructions with settings()->fileName() by usage of
ICore::userResourcePath().

Change-Id: I5a9fa9d09f2563c39dc5d11a4586da825c62f9ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-11 10:42:09 +00:00
David Schulz
2f42bc447b Debugger: detect cdb in non default install roots
Change-Id: Ic5b484c674d750bdcbc24d607720589ee9f056c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-01 07:59:32 +00:00
David Schulz
a4cd04cd61 Debugger: modernize cdb detection
Change-Id: Icc01ee47311fdd6d34df7555afd93bb323fdd05c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-28 12:07:53 +00:00
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02:00
Eike Ziller
14e6a30ebf Debugger: Work around linguist issues
It gets confused by templates that use "class" (QTBUG-55478), and by
certain complicated namespace usages (QTBUG-64007).

Change-Id: I6029922344f6718b5893dd07daee0953366c442e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-10-24 12:25:09 +00:00
Tobias Hunger
3d8be750b9 Environment: Use Utils::FileName for path() and related methods
Update users accordingly.

Change-Id: I9432e82308e9d0630514c6c8632aeb6b6ee0cf90
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-27 07:37:26 +00:00
hjk
69521da36e Debugger: Fix crash on second options opening
Change-Id: I6ca5d860e9c2a82e7032873a0a2c939ab2f4c69f
Task-number: QTCREATORBUG-18189
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-12 12:41:21 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Robert Loehning
68130c5f97 Debugger: Initialize members of DebuggerItemConfigWidget
Change-Id: I445b9fd6d343fca8f03ba1d8b163d31970a7ff7e
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 12:51:51 +00:00
hjk
56409f5afa Replace a few occurrences of QStringList() << ...
... by something shorter.

Change-Id: I363b4e509adb07997517b2d233246a333aea4aea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-08 11:21:45 +00:00
David Schulz
825c84181a Debugger: Fix crash in debuggeritemmanager on Windows
Change-Id: I777fb4ad5de6f10c45443df7898602b98adc5e7a
Reviewed-by: hjk <hjk@qt.io>
2017-01-17 08:28:57 +00:00
hjk
99f2c07403 Merge DebuggerItemManager and DebuggerItemModel data
Change-Id: I400fe94316433c538f82badde12ad704d722d730
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Reviewed-by: hjk <hjk@qt.io>
2017-01-16 17:29:34 +00:00
Christian Stenger
95fa0e397b Debugger: Fix detection of lldb via xcrun
Change-Id: If91efbd1d7a3e01440a3ed5ee0172975c2b0eff1
Reviewed-by: hjk <hjk@qt.io>
2016-09-14 13:28:04 +00:00
Tobias Hunger
5d3823ac47 Use SynchronousProcess::runBlocking
Use SynchronousProcess::runBlocking in favor of SychronousProcess::run.
This avoid nested event loops which can produce really strange crashes
if not use carefully.

This patch only converts those processes that have a timeout of less
than 5 seconds or use the default timeout.

Change-Id: I9de8899dcc946af7049ea357a91972996c0256a1
Reviewed-by: Vikas Pachdha <vikas.pachdha@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-26 11:50:03 +00:00
Tobias Hunger
ddefe062c7 Fix up QProcess::waitForFinished()
waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.

Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-11 10:04:38 +00:00
Orgad Shaneh
383737d020 Debugger: Update debugger details when executable is replaced
Store last modified time in persistent storage, and if it is changed,
reinitialize the item.

Change-Id: I15e8c843fecd3cebd528f2dadb64645828a2b221
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-03-07 07:27:14 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Tobias Hunger
ca29cbfc8a Consistently use Utils::FileNameList
Consistently use Utils::FileNameList in favor of QList<Utils::FileName>

Change-Id: Iafbb466c882bfd91c25c9e78f107d401bfdb6d55
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 08:33:02 +00:00
hjk
683c976b46 Debugger: Don't mention auto-detected binaries
... if they are not working properly. E.g. the
pre-build LLDB 3.8 .deb crashes when executing
lldb -version > /dev/null

Change-Id: Ifd468048ffa0d30aeb99283cb64556609d8b1ef6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-04 09:27:27 +00:00
Orgad Shaneh
90985d18c0 Debugger: Exclude lldb-gdbserver-* from autodetection
Change-Id: If7b887188d3a94ae741c3fcf9a1dbce063a04bd6
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-07-13 06:36:43 +00:00
hjk
db344dfbf4 Debugger: Blacklist lldb-platform-* as possible debugger
Task-number: QTCREATORBUG-14309
Change-Id: I86bb47138a1e3d76120d1c2d0625a86036715d57
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-22 12:09:02 +00:00
Tobias Hunger
b0f3157d25 Debugger: Auto-detect gdb on windows
Task-number: QTCREATORBUG-14157
Change-Id: I3e556a44832fea06f6a57882b0470dcd9c22b0aa
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-03-18 12:41:47 +00:00
hjk
04532fe604 Debugger: Add some expandable macros to Debugger options page
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>
2015-03-04 13:01:13 +00:00
Friedemann Kleint
991cf84991 Clean exported headers of the Debugger plugin.
Change-Id: I70ca6773e0f6aa6d80a441f8920d7f5d2418e1bf
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-26 14:49:20 +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
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
b9ef7b7b28 Debugger: Rework debugger option page
Use Utils::TreeModel internally, simplify code.

Change-Id: Ie5c28519d5c23441fcd6b4fbff470cc70a92ee97
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-07 08:24:36 +01:00
Orgad Shaneh
2022a18f90 Debugger: Improve initialization time
* Avoid QFileInfo where not needed
* Use a more accurate filter for QDir::entryList()
* Remove duplicate paths
* Set filters and filter types only once.

Reduces startup time by ~3%

Change-Id: I8896c08da5281e06672b7bdf6e8305ea394122a3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-12-15 09:26:28 +01:00
hjk
9477ed0a3f Introduce and use FileName::exists()
This can use the faster route through QFileInfo::exist now.

Change-Id: Idb41b5d5185d7f02eacba498fb01f483d95e8d57
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-03 10:23:09 +01:00
hjk
cabf14ba30 Debugger: Use Qt5-style connects in DebuggerKitConfigWidget
Change-Id: I1cac24387cc74ade9113b4ecbe503871e9c6150b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-22 23:15:49 +02: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
Orgad Shaneh
3a76602777 Debugger: Fix soft assertion
SOFT ASSERT: "!m_id.isValid()" in file .../debuggeritem.cpp, line 92

Introduced in 5b5a7d1dea

Change-Id: I82416302402770d885f8eb96b6966294a5368cbe
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-26 10:38:51 +02:00
Orgad Shaneh
5b5a7d1dea Debugger: Avoid duplication of SDK debuggers
Task-number: QTCREATORBUG-12888
Change-Id: I732f1bfe44dc47d0c96570649f3bf8c0e3f40dda
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-25 11:01:06 +02:00
Orgad Shaneh
72e878a126 Debugger: Improve detection of debuggers in legacy configuration
There is a wrong assumption there that ids start with '{'.

Change-Id: I8d753c1b67cfe250435711eab8db9f6dc576195d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-03 18:51:35 +02:00
Orgad Shaneh
ea63b2a6fc Debugger: Make doctype consistent with other settings
i.e. "QtCreator" + filename

Change-Id: I797f86d2266b3e0a612f1b377edc8bdf90914776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:40:10 +02:00
Christian Stenger
e2745ba28d Debugger: Do not list folder as debugger
Change-Id: I32ce5ee2cfd30c786af2d8ae6297c2708fcfd632
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-15 16:37:55 +02:00
Christian Stenger
428b95f62e Debugger: Skip non-executable auto-detected debuggers
Task-number: QTCREATORBUG-11452

Change-Id: I03a7d2b3dda0b7ffa92ddf1d640d9512f501575e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-11 13:35:28 +01:00
Friedemann Kleint
b39de8919e Check if debuggers read from settings files are executable.
Change-Id: I412d3fdf228bcf8948d8247363bf3b034cbb788c
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-01-29 16:45:19 +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
6ab4adabf3 Debugger: Prevent overwriting of pre-defined Abi values
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>
2013-12-02 13:44:48 +01:00
hjk
5747719593 Debugger: Don't register identical debuggers (unless forced)
User code can decide whether it wants something added unconditionally
(by creating a DebuggerItem with valid id), or let the manager re-use
something matching or create an id.

Task-number: QTCREATORBUG-10641
Change-Id: I4f5a1fbe881932ba5608f5c6116b4ea8352f8903
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-07 13:01:52 +01:00
hjk
d02c20ef7e Debugger: Use debugger id for deregistration.
This is better API by being explicit about the item to remove.

Change-Id: I75cb47d7e873f41449efcf4994b2e725ffeeaa73
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-07 11:22:36 +01:00
Fawzi Mohamed
9a4caa4b4c ios: improve automatic kits
* fix incorrect old kits
* avoid adding a special debugger

Change-Id: I233068dbb9958045cdc2e875337297748b2b4ff8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-05 17:00:33 +01:00
Tobias Hunger
22da799cf1 Debugger: Read legacy settings from both SDK and user locations
This fixes Boot2Qt setting the debugger for its kits.

Change-Id: I3ac3ad70b29b6c852e5e50d3e64258e487455b43
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 16:27:38 +01:00
Tobias Hunger
fd8f2c6cdb Debugger: Make cancel work in DebuggerOptionsPage
Change-Id: I09735507703e9a2c55aff68a25a4405cf12c9ab4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 18:07:46 +01:00
Tobias Hunger
b17e8e3061 Debugger: Rewrite logic to use signals on DebuggerItemManager
Change-Id: I82e1cd3cca9cc2d79366e1af054640dadebf7871
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-28 17:55:27 +01:00