Commit Graph

67787 Commits

Author SHA1 Message Date
Tobias Hunger
b329b7220b ADS: Do not re-use variables
Change-Id: I2aee3d6684d40077acfe652638292901bd660ea6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 14:59:39 +00:00
Christian Kandeler
45d42d4518 CompilationDbManager: Do not create an extra target
The hidden extra target creates all kinds of inconsistencies, e.g.
between mini project target selector and target model.
Besides, there is no reason why this project manager should behave
differently from the others in this respect.

Fixes: QTCREATORBUG-23518
Change-Id: I11022f63bed33191f6349681356b4dd9537de50c
Reviewed-by: hjk <hjk@qt.io>
2020-03-03 14:46:59 +00:00
Tobias Hunger
3efa2a6af0 ADS: Prevent nullptr access in DockWidget
Change-Id: I071fd6a86d8e6951305d4e2d82d2025afafd4fc6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 13:26:41 +00:00
Tobias Hunger
79efcb76f6 ADS: No more structs in DockWidget
We do not use struct in QtCreator.

Change-Id: I97988dfc5d549d89fe78bfd710b922c11d6fb8fe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 13:14:56 +00:00
Christian Stenger
f33d56a53d LanguageClient: Fix build with namespaced Qt
Change-Id: Id3daafa070aa2159f02cdac2cc8ed4348183b9aa
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-03 13:03:46 +00:00
Assam Boudjelthia
fc3f5033e2 Android: fix minor syntax issues
This fixes minor things missed in previous commit
b081d7dc8f.

Change-Id: I47c0703a81726d7c0c2bf01d844e39096424ea5e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-03 13:02:10 +00:00
Vikas Pachdha
07cbc49d33 Allow blocking auto files refresh
While importing assets, qml files are generated under the import
path and this triggers files update every time a file is added.
This results into high CPU usage.

Task-number: QDS-1675
Change-Id: Ia0775ef78bbffedfaf2c140365ee31718e7ee3a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-03 12:50:17 +00:00
Leena Miettinen
40899c7209 Doc: Describe changes in the diff editor
- Describe the context menu commands in the diff editor
  when used with Git
- Make the description of colors less specific, because they
  depend on the theme
- Use "chunk" consistently instead of "hunk"
- Update the screenshot

Change-Id: I6c9ec4eee8ff80f171558c930e5e448ac493f927
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-03-03 12:34:08 +00:00
Miikka Heikkinen
d2bb3b0358 QmlDesigner: Update 3D Edit view icons
Task-number: QDS-1691
Change-Id: I2f41a912217ba4494cf622e0ad11fac60dbd6b1b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-03 12:32:04 +00:00
Assam Boudjelthia
75a895a7a3 Android: place add permissions combobox on top of the list view
It's more convenient to have the add permissions combobox
on top of the list view, so that it would be directly visible
without needing to scroll down, especially if on non-fullscreen
mode or small screen.

Task-number: QTCREATORBUG-23283
Change-Id: If3ef29fc91dd38f00d03ec63ce56103728c4b5f9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-03 12:29:21 +00:00
Assam Boudjelthia
b081d7dc8f Android: allow style extraction method selection to the manifest editor
Make a bit more easier to choose the method of style extraction to
the manifest editor UI.

Task-number: QTCREATORBUG-23283
Change-Id: I65ad52f07d31913cf091ef4ef1693617ac82d4ad
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-03 12:29:01 +00:00
Alessandro Portale
daa9804699 McuSupport: Prepare support for more toolchains than GNU Arm Embedded
Move all hardcoded arm-specific strings and code into the new
McuToolChainPackage class (which will later support IAR and KEIL).

In the same change: Adjust paths in CMake options to latest Qul path
changes in the master branch.

Change-Id: Iefa205729588a3efa783eb9eaaa339ed9f8e2813
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-03 11:23:29 +00:00
BogDan Vatra
42b595d865 Move SimpleProjectWizard to ProjectExplorer plugin
Now SimpleProjectWizard supports also cmake buildsystem therefore
qmakeprojectmanager it's not the best place to keeping it.

Change-Id: I383ee89ea22e8df157cd98f644d3fd971e3c2382
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-03 11:12:16 +00:00
BogDan Vatra
fb252248be Improve simpleprojectwizard
- add Qt modules
- add support for cmake build-system

Change-Id: I80ea5ef78bbffedf8f2c140365ee31718e7ee4a4
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-03 10:53:37 +00:00
hjk
b0b50257ec ProjectExplorer: Pass extra project files as QSet
They are available in some cases as such, and consumed as such.

Change-Id: I9866c7d7bd817fb19a8b11a0efbe583ed55fe393
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-03 09:17:20 +00:00
Christian Kandeler
757628bf4a ProjectExplorer: Fix Project::setExtraProjectFiles()
This function was buggy and could erroneously un-watch all the project
files after the first update.

Change-Id: I528fd8da7f873598e08f4c0177757a052fbb97ef
Reviewed-by: hjk <hjk@qt.io>
2020-03-02 16:40:34 +00:00
Christian Stenger
c7e2ba9c14 LanguageClient: Fix passing proposals
Pass the real proposals around instead of a copied
nullptr.

Change-Id: I1a8678bcbd5838113f6416b6f63d92d6cceceb3f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-02 13:44:27 +00:00
Leena Miettinen
015d09a9e7 Doc: Describe new supported LSP services
Change-Id: I3e0e9b92945b48ffa2f349924762f6bb0fef3c87
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-02 13:40:27 +00:00
David Schulz
821f073f15 LanguageClient: Add logging window
Change-Id: Ib86b70381b69df55d62a97abdf52b747f7f1c75e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 13:38:46 +00:00
Tobias Hunger
3bb44dc1c3 Nim: Fix nim trying to parse several times
Prevent Nim from starting to parse several times simultaniously.

Change-Id: I45dd747419585506a0c0e10af8171fdfb4d6eb6b
Reviewed-by: hjk <hjk@qt.io>
2020-03-02 13:27:30 +00:00
Tobias Hunger
c32f80b4a7 GenericProject: Simplify Guard handling
GenericBuildSystem::refresh(...) already takes care of a guard,
so there is no need to get and store another one in
GenericBuildSystem::triggerParsing().

Change-Id: I83875ac4a42bfaf67997b5f1977f63913fc1d76c
Reviewed-by: hjk <hjk@qt.io>
2020-03-02 13:27:23 +00:00
David Schulz
472797a1d1 Dumper: avoid redundant labeling
Change-Id: I85581cfe34a60e7f8a3e3590358443a15b7d2d4c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-02 12:14:22 +00:00
David Schulz
d91d4aa759 Dumper: remove unused imports
Change-Id: I447c9697dbd631ab26358c193c274484e70a908d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 12:13:34 +00:00
hjk
1e8f262322 CMake: Compile fix
Amend 7dd8858fa2.  Was not unusused after all.

Change-Id: I18c5f5033ebd8b3e19ebdf4718465d6b4ba6acf4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-02 12:13:04 +00:00
hjk
6164378372 ProjectExplorer: Replace a few foreach()
Change-Id: I445cdfaac13ac894be3cd6fc8c20b4a09f460a01
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-02 11:54:00 +00:00
Cristian Adam
6d169ae7aa CMake Build: Less file creating during configure
Change-Id: I263853f0a903d81a8d869bc4f5683e1a1b0078e2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-02 11:31:39 +00:00
David Schulz
3c4acafdb6 Editor: Fix crash on exit
Make sure no FontSettingsPageWidget is created when changing the font
zoom level in the editor. Otherwise it will crash in the font combo box
when closing Qt Creator.

Since we can't use the save and emit mechanism from the widget anymore
move it to TextEditorSettings

Change-Id: I1eb87bbae3cf2b802fb15981e7fc2203106d5565
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 11:24:57 +00:00
Christian Kandeler
2ce03eae18 QtSupport: Relax ABI matching when fixing a Qt kit
E.g. consider MSVC 2019 a candidate when filling in the toolchain in a
Qt kit that doesn't have one yet.

Task-number: QTCREATORBUG-23653
Change-Id: I90aeb6f80c8f95faafa1e345f51fde77ddd0d2bd
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-03-02 11:21:22 +00:00
hjk
7dd8858fa2 CMake: Remove unused CMakeBuildConfiguration::emitBuildTypeChanged()
Change-Id: I4cb93a7f89ff4bcada2083bebd8e9e96770f4818
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-02 11:12:11 +00:00
Christian Stenger
26e4a2a758 Qbs: Fix build target key of project part
The build target key is the basic mapping of project
part to run configuration and this went out of sync
with the latest refactorings of the Qbs project
manager.
This fixes execution of tests inside the AutoTest
plugin for qbs based projects.

Change-Id: I7d7a703a341df98a015f9c83d3c2a320d46779c3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-02 10:12:32 +00:00
David Schulz
b718f47893 LanguageClient: Request symbols in outline combo box constructor
Change-Id: Ib7bc4f828b6e3abc4344ff96b7561015ac0cf66f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 10:07:44 +00:00
hjk
8a8c49eb2e ProjectExplorer: Simplify update logic after active target change
Change-Id: Ia1d9366b1f2ff2b7ae02604bc43b38ca4b914c17
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-02 10:07:33 +00:00
David Schulz
df2525a54e LanguageClient: request symbols for all compressed uris
Change-Id: Ib6d08f7d4f1efaaa2b484af312599b8b338fbcf5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 10:07:27 +00:00
David Schulz
6f35a66201 LanguageClient: clear compressed uri after requesting symbols
Change-Id: I1247959d657c5449a37a9e2ac16380eb9b14afe0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 10:07:18 +00:00
hjk
722705e1e7 AutoTest: Use normal object for settings
Ownership is clear here.

However, since this is accessed via the static plugin interface,
this needed some change that access.

Change-Id: I9488a242442303dee89006240f787677afab730a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-02 09:56:10 +00:00
Alexis Murzeau
9da71b940a MsvcToolchain: Rework detection of supportedAbis
Commit 9912a409da made changes to
implement user MSVC toolchains allowing to set custom arguments to
vcvars bat file.

This commit introduced the possibility to have multiple supported Abis
for a MSVC toolchain.
But the supported ABI detection broke with older toolchain that are
initialized with a vcvars32.bat and the like (as defined in
MsvcPlatform platforms).

msvc2010 and VC2015 build tools got affected, the detected Abis were
empty and made Qt Creator to fail to load these toolchain from
toolchain.xml (as a non empty m_supportedAbis list was required).

The effect of this is that any Kit that was referring to these compilers
was reset to "No compiler" every time Qt Creator is started.
In that case, the user could workaround the issue by reconfiguring Kits
after each Qt Creator startup or never close QtCreator which is
impractical.

This commit is a rework of the fix introduced in
708179285d which was a minimal fix
introducted in 4.10.2.

This commit fix this issue by removing the notion of multiple ABI per
MSVC toolchain and instead iterate all detected toolchain for matching
ones when populating the ABI widget via setAbis.

This also makes only one proposed ABI in the mainComboBox of AbiWidget
for any selected varsBatArchCombo. So it is no more possible to have a
32 bits proposed ABI with a /x64 varsBatArchCombo for example.

At any time, if the user wants to set a different ABI for a given
varsBatPath/varsBatArch, he can still select the "custom" item and
manually configure each part of the ABI.

Task-number: QTCREATORBUG-22960
Change-Id: I753e96db3b0e83371fa39d91c4a3592bd1552b8e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-01 14:44:24 +00:00
Andre Hartmann
d76a2f4fcd Deduplicate elapsed time formatting
While it's nice to see my code spreading,
I still prefer to have it at one place.

Change-Id: I7bdb13c47ed7e96227deeb14b0a8070aa40148de
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-29 18:21:47 +00:00
Andre Hartmann
41cb713370 SubmitEditorWidget: Inline two small functions
Change-Id: Ia9b2c451a587d418ccf39707c25d8aff062f6ed8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-02-29 18:21:29 +00:00
Assam Boudjelthia
3f61e9a391 Android: Allow adding custom NDKs and auto detect their toolchains
This adds the option for the user to add a custom NDK out of the
predefined list installed from SDK manager. Once an NDK is added and
settings saved, both the toolchains and debuggers will be detected
automatically. The user then can create a custom kit with those added
toolchains and debuggers.

Task-number: QTCREATORBUG-23286
Change-Id: I46200accca6fc956b73f211213bfe2a495093934
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-28 19:19:12 +00:00
Alessandro Portale
b4dfda5814 McuSupport: Let application wizard generate a .qmlproject in addition
It sets the qtForMCUs flag to true, so the the QmlDesigner plugin
can filter out the unsupported imports and properties.

Change-Id: Ic5728ff334b410742518c564d88d72957d6c979d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-28 16:03:40 +00:00
Alessandro Portale
33904afa73 QmlProjectManager: Fix setting of QmlProjectItem.qtForMCUs
Change-Id: I0f98d21b7d343685f6e696526486ef17dc7b632e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-28 16:03:21 +00:00
hjk
fb447f9999 ProjectExplorer: Trigger updates more directly
Changes of active run and build config impact some visible state, but
instead of connecting and disconnecting signals to the target, make the
call explicit.

Also, triggering only updateAction is sufficient, as this will already
run updateRunAction. This makes the number of doUpdateRunAction calls
when opening a normal QMake project with one target, three build configs
drops from 17 to 15.

There was some mechanism on the receiver side originally meant to
prevent excessive updates, which broke with 7ae3589 when remembering the
previous configurations was accidentally removed.

This here drops the mechanism completely, as active changed signals
would not trigger twice in succession for the same config anyway.

Change-Id: Id9f87e542d8871733966ab79118734b7e9ad1e8a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-02-28 15:31:52 +00:00
Thomas Hartmann
620e17cf7b QmlDesigner: Implement usage of qtForMCUs property
If qtForMCUs is set in the qmlproject file we disable unsupported
properties like roation, transformOrigin or layer.

Change-Id: I75d9677beca3d4ce71f975b4f0ae75e63967d143
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-28 15:27:36 +00:00
Thomas Hartmann
ea7457410b QmlDesigner: Fix potential crash
Change-Id: I99cbddfed3d343638d707d2915e77bd962200498
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-28 15:12:41 +00:00
Thomas Hartmann
87d18ec0dc QmlDesigner: Add import filtering for QtForMCUs
This implements basic import filtering for QtForMCUs.

Change-Id: I3b8bfbee11b26f1512cd5864057a347afe09c93f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-28 15:12:26 +00:00
Leena Miettinen
0750af7049 Doc: Describe the "Go to Last Edit" function
Returns to the last location where you made a change.

Change-Id: I35cda32d28b51b0fcfe31fd17e03ce103a87b447
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-02-28 13:54:08 +00:00
Leena Miettinen
d07d118b44 Doc: Add missing separators to menu paths
Change-Id: I58fe828d204ebc636fd529be9759bdeb5a8fe76a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-02-28 13:34:53 +00:00
Mahmoud Badri
55b3d53213 Handle the case when there is no 3D Nodes in the qml doc
When there is no 3D node in the qml doc, the view 3D will still be
enabled and manipulate-able. Also few relevant tweaks.

Task-number: QDS-1693
Change-Id: I758f783108b317a6971703bee8e3fb564400ed8b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-28 13:19:44 +00:00
David Schulz
4165d16053 Core: Fix rounding issue in highlight scrollbar
Fixes: QTCREATORBUG-23660
Change-Id: Ifcaf4e705a0a037c58ffedf36605b3eecfc698de
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-28 12:47:39 +00:00
Assam Boudjelthia
a75cb04442 Android: keep the debuggers list updated with auto detected toolchains
Current autoDetected Android debuggers list is never cleaned, if one
sets up many NDKs it could get really big and messy. This change tries
to keep it clean from old or duplicate entries, as well as keep it
chained to the autodection mechanism of Android toolchains and kits.

Relies on 291807 to allow autoDection for kits, toolchains, debuggers
to work out-of-box.

Change-Id: I320a021f0435d80fd3d56c060caa316def533afa
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-28 12:39:48 +00:00