Commit Graph

53197 Commits

Author SHA1 Message Date
Christian Stenger
8fd3f55dbb PythonEditor: Ensure project file is listed first
Change-Id: I43377a97d4ef82e8ed3824a766ba86db086f4dc7
Reviewed-by: hjk <hjk@qt.io>
2017-10-18 12:46:33 +00:00
Christian Stenger
0a931c56a4 PythonEditor: Avoid creation of useless empty run config
Opening a python project created an empty 'Custom RunConfiguration'
the first time it had been opened.
Avoid this by re-ordering and simplifying the processing of the
project and its respective settings.

Change-Id: I0c0f71e0dab6f03df46e5ddbdc7e1dbf73e8bef8
Reviewed-by: hjk <hjk@qt.io>
2017-10-18 12:46:24 +00:00
Thomas Hartmann
172f25d97d QmlDesigner: Fix crash
We have to forward the event to GraphicsView in any case.

Task-number: QTCREATORBUG-19064
Change-Id: I50e7fc73dca4d8aa5deaf2be7bec5fb89778111d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-18 12:16:50 +00:00
Thomas Hartmann
bc9cea81e9 QmlDesigner: Fix navigator context menu
Depending on the context and focus we are disabling actions.
But we did not enable actions when setting the focus/context
back to e.g. the navigator. We "simulate" a selection change
to set the proper state of the actions.

Task-number: QTCREATORBUG-19110
Change-Id: Ie4eefb498956de22d33d72bd7189bacd3177912b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-18 08:56:03 +00:00
Thomas Hartmann
6c690f68cb QmlDesigner: Remove dependency on utils
The dependency is not required and
we do not set the rpath on Linux.

Change-Id: Ife1a8ae46f9087bd507d1f0abd465fec0bd31ca3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-18 08:19:33 +00:00
Leena Miettinen
b0039fae98 Doc: Add a step list to Using QML Modules with Plugins
Reorganize the sections in the topic to match the order of the
list.

Task-number: QTBUG-63480
Change-Id: I976647fa11e3046abcd5aad322bf60029656b3e4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-10-18 07:28:35 +00:00
Christian Stenger
fb4f66927d Squish: Adapt tst_HELP05 to changed template
Change-Id: I03973193b2a705af632fd8978b37873bde51006f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-18 04:56:11 +00:00
Christian Stenger
c4ec04d254 Squish: Adapt QMLS suite to changed template
Change-Id: I43fcb9a47759025c4da2d2fba75c4fa05d1dc340
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-18 04:55:20 +00:00
Christian Stenger
e33d0cb1d0 Squish: Adapt Qml indentation test
The used Qml file template has changed.

Change-Id: I594c77f05ac51a49afe2498d61aea54abd5b8677
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-10-18 04:54:57 +00:00
Tobias Hunger
aa4e05f07b CMakeBuildSettingsWidget: Fix filtering in cmake configuration
This got broken with the introduction of the grouping.

Task-number: QTCREATORBUG-15814
Change-Id: Ic9908d01a1ecb636db0c8f4b7f1db926ccaedd4e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-17 14:47:02 +00:00
Tobias Hunger
b49722c820 CMakeBuildSettingsWidget: Forward-declare ProgressIndicator
Change-Id: I3808e973671849c6014780ee99896cb2d139dc18
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-17 14:46:56 +00:00
Tobias Hunger
0a5f32ff75 CMake: Fix crashes when last target is removed from a project
Task-number: QTCREATORBUG-19112
Change-Id: I17893c3e15e9cabc09bf5ebb6746a5d76d9cc0bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-17 14:46:49 +00:00
hjk
87cd4495a9 Debugger: Pass interrupt request more directly to engines
De-virtualize requestInterruptInferior() and let always
the master engine react to the request. interruptInferior()
diverts to the active slave in case of the combined engine.

Change-Id: I5d62cf9379c8a452132827897a9ac51e4027f595
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-17 13:57:34 +00:00
Tobias Hunger
dfe23b210d Qnx: Code cosmetics
Change-Id: I8ac1ff2bbe2c16b080dcfced489c1c932dbd102a
Reviewed-by: hjk <hjk@qt.io>
2017-10-17 13:22:17 +00:00
hjk
f3b886c4c1 Debugger: Make some error message translatable
Change-Id: I4573c26df5d41d6fdab4ddeb1d70ee5d2bc10c11
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-10-17 12:28:32 +00:00
Orgad Shaneh
e633b49cd0 Gerrit: Suppress updates while remotes are cleared
Change-Id: Iec13f7002816db54279507250a6b5050f41b45f2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 11:54:58 +00:00
David Schulz
ae68aa5610 TextEditor: Update position of annotations outside event rectangle
Change-Id: Ie7d3db989b48a605fad4642c339940d67e505e1e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-17 11:48:39 +00:00
Christian Stenger
13717262a1 TextEditor: Fix determination of maximum width
Width is not zero-based.

Task-number: QTCREATORBUG-19091
Change-Id: I32134727bed204f6bb10748cd067a775f673b89b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-17 11:46:10 +00:00
hjk
4977c91544 Debugger: Directly pass from engine to inferior setup in all engines
This removes the setupSlaveInferior() synchronization point which
wasn't really needed anymore as it was always triggered in
response to a notifyEngineSetupOk() of the master engine.

Change-Id: I24faec36b180fa961e10dfd88fe4d874f7310140
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-17 11:20:09 +00:00
Andre Hartmann
6221746466 Qmake: Fix Build File (context) menu for non-source files
Enable Build File for source or header files only and
de-duplicate the corresponding code.

Before, the menus were incorrectly enabled for e.g. .pro
and .ui files also: While the menu was already hidden for
these  non-source files in updateContextActions(), the
following  call to updateBuildFileAction() did enable it
again.

Task-number: QTCREATORBUG-19098
Change-Id: I87f40e64ab044b33be9c465d1c5dfa36c3cf1260
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 10:25:30 +00:00
Eike Ziller
46a5133f4b TestFrameworkManager: Add missing static keyword
Change-Id: I22aced21a8c951c746c6617d20d95fd81f5cef63
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-17 10:01:28 +00:00
Ulf Hermann
eeb0358d65 Debugger: Re-add quotes to JS strings after editing
The quotes are stripped when the string is presented for editing, so
they have to be added back when we're done editing.

This is what we already did if we were talking to the inspector rather
than the V4 debugger.

In order for this to work, JS numbers need to be identified as numbers,
rather than strings. So, we have to add "number" to the types recognized
as float.

Change-Id: I2054f4ad36ec1d14fb2dfee3705a80c8ec84d5ac
Task-number: QTCREATORBUG-19032
Reviewed-by: hjk <hjk@qt.io>
2017-10-17 09:47:51 +00:00
hjk
34d7b26a88 ProjectExplorer: Shield against null project
.. in MiniProjectTargetSelector::addedDeployConfiguration. Similar
was already present in  MiniProjectTargetSelector::addedRunConfiguration

Change-Id: Ie1c86a8e12bdbfd5c0beea58a1a41a2cbf3d52f2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 08:56:22 +00:00
Leena Miettinen
b8533dcb95 Doc: Add the location of wizards on macOS in installed Qt Creator
On the other platforms and in the sources, the wizards can be found
in share/qtcreator/templates/wizards.

Task-number: QTCREATORBUG-19103
Change-Id: Ic8c67e3b45f294c6e5bc175938de6182364dd584
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-17 08:55:57 +00:00
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
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
Leena Miettinen
eb5b45aa6c Doc: Add tip about stopping processes to troubleshooting debugger
A customer had trouble launching debugger on a Wacom Tablet
when other processes were running. After all processes were
stopped, the debugger could be launched.

Change-Id: Ifd3da7904e9ff8e7af958e6abc7b21c1a88fa2e2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Mika Salmela <mika.salmela@qt.io>
2017-10-17 07:15:15 +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
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