Commit Graph

44349 Commits

Author SHA1 Message Date
hjk
b76651bd72 Debugger: Do not duplicate state
GdbEngine::m_startMode should be always the same as in the RunParameters.

Change-Id: Iceac9b28b8273847f7ee518572d93e796fffeb14
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-17 08:52:00 +00:00
hjk
ca56ac1ac6 Debugger: Code cosmetics
Remove unneeded include and declaration.

Change-Id: Ib0aca8a6b76a58f0231c507298ed91c659c2e74b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-17 08:51:50 +00:00
Christian Kandeler
63a472a81a Fix run control startup message for remote targets on Windows
The exectuable path in the user output was always converted to native
separators, even for non-Desktop targets.

Change-Id: I5b43b2da8a2b791472a1fd58940b179dcbaa28d0
Reviewed-by: hjk <hjk@qt.io>
2017-10-17 08:49:15 +00:00
Tim Jenssen
19203ebbf7 QmlDesigner: clear texteditor view statusbar
- when puppet is restarted
 - when the view is attached (switching document, switching mode)

Change-Id: I06a4acf78a18b893bca9f7cd3d2bae74dc3459aa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-17 08:35:49 +00:00
Tobias Hunger
b1157e4e63 CMake: Allow to unset configuration values
Change-Id: I649323e3c2cc51ea69dd7e216f30eeb653f3873b
Reviewed-by: hjk <hjk@qt.io>
2017-10-17 08:21:07 +00:00
Tobias Hunger
95bd5b0d68 ProjectTree: Fix soft assert
Fix soft assert when accessing the lone project file node in a project
that failed to parse.

Change-Id: I73d9b0012292dd5516a0a9c81cdc4003eebf2a92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:17:02 +00:00
Tobias Hunger
3d0339844e ProjectModels: Use better way to retrieve project
Use a better way to retrieve the project from a containernode.

Change-Id: I8b0a0aa86e823ef3b9cab512a1374f7fb77f1aa3
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:16:49 +00:00
Tobias Hunger
7cba979840 ProjectNodes: Remove unused member
Change-Id: Iaeca64c025a870ce83f9d806fdd3e086599046d5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:16:32 +00:00
Tobias Hunger
1a5eaecd97 Project: Avoid unnecessary activeTargetChanged signal
Make sure to create the active target first when reading a project
for the user data. This implicitly sets this target to the active one,
avoiding one spurious activeTargetChanged signal.

Change-Id: Iff9b19ed25bac9809ae75489ae159ffb66e71cb4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:16:25 +00:00
Thomas Hartmann
aeb45f5cbe QmlDesigner: Select item that is dropped to navigator
Change-Id: I2c5bf237cc29eb42f26b357eb31922323639bf71
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-17 08:01:57 +00:00
David Schulz
b248953247 Debugger: Fix attaching to running process with cdb
Do not add inferior command line arguments to the cdb process if we are
attaching to an already running process.

Task-number: QTCREATORBUG-19034
Change-Id: I7b9a98b790e819fc76ff4ec75769785741bfde83
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-17 07:55:24 +00:00
Orgad Shaneh
be3254c7c3 Gerrit: Resolve version also for valid servers
Change-Id: I2d02aec89bf5d7afe1d173fb5054f92f9bf1c3bf
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-17 06:27:14 +00:00
Christian Stenger
fe5ab8da81 AutoTest: Fix retrieval of build system target
If we failed to find a project part for the respective file
it is most likely that we had a header with declarations only
but we can still find depending targets for this file.

Task-number: QTCREATORBUG-18922
Change-Id: I80d0af569bbd6c2a41bf498fb55283704f16439c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-17 05:39:32 +00:00
Christian Stenger
094f7120c1 PythonEditor: Fix run config names
Change-Id: I1131fdfdb1599bf470db502c222792d4419fa13e
Reviewed-by: hjk <hjk@qt.io>
2017-10-17 04:56:05 +00:00
Christian Kandeler
a050d75517 Add missing include
Change-Id: I5e52706817f4345ea707b5e8c07923c8c836ca0e
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 15:39:11 +00:00
Thomas Hartmann
2474ae2587 QmlDesigner: Fix crash while changing code
Especially when the code editor is used types can be invalid.

Task-number: QTCREATORBUG-19079
Change-Id: I4c832c3ce10b7ed10c99ae53470fc79d6a23bfb9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-16 15:36:59 +00:00
Orgad Shaneh
8f91a63cc2 ClangSupport: Rename export macro
Change-Id: Ia314f82212210f8ed17067c1f8bb412367e6aa90
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-16 14:54:44 +00:00
Ulf Hermann
d386b4ed6d QmlDebug: Extract a general QML debug connection manager from QmlProfiler
We can use it for other QmlDebug run controls, too.

Change-Id: Iee1cd592848ef4c48954a2674b6fa509223fcda4
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 14:04:24 +00:00
Ulf Hermann
a54685aa59 QmlDebug: Use versioned packets for engine control client
The service also uses versioned packets and not doing this might create
subtle bugs.

Change-Id: I54dfbe4f8e3d3a71daf2fe503a609c52c6a158bb
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 13:57:27 +00:00
Alessandro Portale
e50b75b5d8 Welcome: Show the url of link buttons as tool tip
Less secretiveness about what these buttons do.

Change-Id: I145e5a3e62ccaffd2d1cb97614154a0ef43e1369
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 13:39:50 +00:00
Thomas Hartmann
ef07e39c02 QmlDesigner: Use filter on display and type names
The filter was applied just to the display names which
was confusing. We use the display and typ name with this patch.

Task-number: QTCREATORBUG-19054
Change-Id: I5671d8d615bbb89d3a46a76fd45f88d0f76c8557
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-10-16 13:26:20 +00:00
Marco Benelli
32e444d9cc qmljs: use IEditor to positioning cursor after reformat
Thanks to the IEditor interface, there is no more need to use the
editor's widget.

Change-Id: Ic316dd21572ec5c36e10c9213a6c5d19bd7c62e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-16 13:15:19 +00:00
Marco Benelli
267167a097 qmljs: do not reset undo/redo history in reformatting
Task-number: QTCREATORBUG-18645
Change-Id: I5b64fa5e59af3d871d3124d668bfd1f86883e752
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-16 13:15:03 +00:00
David Schulz
ba54fa8a10 Debugger: Do not override environment when using run in terminal
Change-Id: I4ab30bb81462de34c4c7f9c4ef0b10f7731f5bcc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-16 12:15:11 +00:00
Filipe Azevedo
9ebe266ae5 Add public api to set the inferior environment
This is needed for the GammaRay plugin.

Change-Id: Ia76c02756e9deb6f679c871a5cba1f6fc4c5028f
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 11:49:44 +00:00
Marco Benelli
c054dd2cff QmlJs: fix bug in resolving qml imports
The introduction of Controls.2 changed the way in which imports are
resolved. This patch fix some leftovers of the old resolution scheme.
Such leftovers caused false positives in import declaration to happen
when resetting the QML/JS code model.
The code has also been simplified a little, by the removal of
duplicate code and of unused methods.

Change-Id: I90bdf7ed47fdfea7cbd8259acd7a9a968f27301b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-16 11:10:17 +00:00
David Schulz
79bdd7e14f TextEditor: Fix update loop for annotations
Task-number: QTCREATORBUG-19091
Change-Id: I5f699747df10e25d412b2eec4620c3b51ad628e3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-16 09:54:33 +00:00
Donald Carr
bf464875f6 Restrict Unity workaround to Unity session
Allow explicit native menubar disabling as there are platforms with
known broken implementations.

Change-Id: Ice5fb1270969b422eb1a964fab5e305bc658c667
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-16 09:38:07 +00:00
Orgad Shaneh
e098134d43 Debugger: Report done when terminal *process* is stopped
Do not wait until the stub exits.

Task-number: QTCREATORBUG-19056
Change-Id: I7c4c3438c960a6e418ccd6c9d96d01d9621e9b02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 09:24:03 +00:00
Christian Kandeler
3116d901ee QbsProjectManager: Show executable path in run config widget
This appears to have broken in a recent refactoring.

Change-Id: Ice186197329b3b22635a8aca6d9bb4bb6e3418c5
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 09:14:13 +00:00
Christian Kandeler
79d11ed740 QbsProjectManager: Fix run config names
After 890c1906e6, all the run configurations had generic names, because
the initialize() function did not call the base class implementation.

Change-Id: I2eff43f7c40214bcc1167d596fe2328a4b3c122a
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 09:05:25 +00:00
hjk
4fa869f6a0 ProjectExplorer: Provide optional callbacks to RunWorker timeouts
Useful in some more complex setups.

Defaults to the tradionally unconditional reportFailure().

Change-Id: I26acaace1fa1e12caf83b785e4be539d8af7eb73
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-16 08:55:08 +00:00
Filipe Azevedo
eab3a24526 Avoid soft assert when closing an already stopped run control tab
Change-Id: I1d39d6450ab32a3d1e75c120b85362806bb2a60e
Reviewed-by: hjk <hjk@qt.io>
2017-10-16 07:54:14 +00:00
Orgad Shaneh
c19c2551fb Gerrit: Move push target logic to GerritPushDialog
Less indirection + will simplify new private/wip flags.

Change-Id: If8c4072b6456b4044d83ef17e130e0360a1d05f8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-10-15 16:44:59 +00:00
Orgad Shaneh
7a04014f9f Merge remote-tracking branch 'origin/4.5'
Change-Id: I2d78020f10aa66fdded63883030313e0c411ce02
2017-10-15 00:23:08 +03:00
Orgad Shaneh
b67bf73dc7 Debugger: Fix run in terminal
setUseTerminal was called before the engine was set. Reordered it.

Task-number: QTCREATORBUG-19056
Change-Id: I43f2aebaf72a904ea3a3bcf03cd41186b191b209
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-10-14 16:35:16 +00:00
Alessandro Portale
81c5906970 Valgrind: Remove dead code
Change-Id: I77fdb0f07dabf742bccd88016463b01f45c011ca
Reviewed-by: hjk <hjk@qt.io>
2017-10-13 19:56:37 +00:00
Tobias Hunger
271635ed1f QmlDesigner: Remove unnecessary destructor
Change-Id: If4a9e6a8f252f00feecb298022dc0065dbda44a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-10-13 18:08:29 +00:00
Filipe Azevedo
e1ff09f332 Fix memory leak
This is not really a leak because they are owned by the main window.
But they accumulate in memory for nothing.

Change-Id: I521f3c9e3e535cd22ae27c974257866d1d6403b7
Reviewed-by: hjk <hjk@qt.io>
2017-10-13 16:43:35 +00:00
Jake Petroules
e2bacb1dc9 Android: Fix qbs build
Amends ec4fe5f04f and 476b133e91.

Change-Id: I0ecd76bdbd096a6325132011522e417d633de7a5
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-10-13 16:19:27 +00:00
Christian Kandeler
5f1705128a Update qbs submodule
To HEAD of 1.10 branch.

Change-Id: Ic6be03e3d0802a76f3bf2916f37b647526fb2b2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-10-13 13:14:53 +00:00
Orgad Shaneh
5a7a8cbf74 Gerrit: Resolve and store gerrit version
This can be used for enabling features that are available from a specific
version.

Change-Id: I4ce1c8684df2b8e194e8bbb02769ba99fc256408
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-13 13:06:31 +00:00
Orgad Shaneh
5e798b0bf4 Gerrit: Improve error message when Gerrit remote is missing
Task-number: QTCREATORBUG-18980
Change-Id: I99336732d59136f9aec9fc0a97fb3135e9c43f65
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-13 13:06:14 +00:00
Tobias Hunger
d717ab4fdf QmlDesigner: Remove unnecessary QLatin1String and QStringLiteral
Mark strings as translateable where appropriate.

Change-Id: If82d234e4eeb4fca1c5153fbce7749c9ead86260
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 13:00:52 +00:00
Tobias Hunger
7c533107d9 QmlDesigner: Remove unnecessary code, add overrides and modernize
Change-Id: Id6751219a2459c1c9673932650c768984f86cb62
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 12:57:13 +00:00
Tobias Hunger
b170996225 QmlDesigner: Remove dead code from puppetcreator
Change-Id: I5e648f1083882be7bad87a7fdbccfd2b3c96a9a9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 12:57:08 +00:00
Tobias Hunger
0fe63ea698 QmlDesigner: Use more nullptr in puppetcreator
Change-Id: Ia723b1629c0d5aff49f54dc026efe0f822f2267a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-13 12:57:02 +00:00
hjk
f1888a6331 Debugger: Remove no longer needed DebuggerEngine::setNeedsFixup()
Change-Id: I30bc1d6184bd66a634d890999e31dff48d2f25b4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:36:20 +00:00
hjk
cc7754920c Debugger: Simplify use of DebuggerEnginePrivate members
Each engine has now the RunTool pointer, not just the master.

Change-Id: I6bab026998d5da5da82224bfaf4a93d3cfb3a898
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:35:43 +00:00
hjk
ad4ec4eb3c Debugger: Remove DebuggerEngine::m_lastGoodState
The only use left was a not-so-important debug message.

Change-Id: I91bd1b744fb2f173037777461dd15e7720421ccc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-13 12:34:42 +00:00