Commit Graph

82976 Commits

Author SHA1 Message Date
Jarek Kobus
181b5ee28b AbstractRemoteLinuxDeployStep: Enclose prechecks in recipe
This is a preparation step toward making the recipe more general.
Add a runRecipe() method (private for now) which
describes the whole step's execution. Later, when
virtual BuildStep::runRecipe() is added, we just
make this newly added method virtual.

Make deployRecipe() pure virtual.

Change-Id: Ic9c4e3eea7d4a3eb95fd419575f4f747224d0499
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-11 07:58:35 +00:00
hjk
dddf16226a McuSupport: Use aspects more directly in McuBuildStep
Change-Id: I2c4c033a23fa9e8de9f8439fbddbc0127a18c150
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-11 07:37:39 +00:00
hjk
62795df12a Python: Use aspects more directly in PythonRunConfiguration
Change-Id: Id85348473236bc01ddcc65ec5302c0537c98c526
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-11 07:13:10 +00:00
Christian Stenger
f2c96b4c4c MesonPM: Fix compile before Qt6.5
Amends d4260dab85.

Change-Id: Ifa5976002d8bdd39f3742e24be20b40b04067e7f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-11 07:11:15 +00:00
hjk
d003cca74e McuSupport: Compile fix
Amends 96506f1f6a

Change-Id: Icfdb889fa76f99c735e0b65782c54d1c2dda974f
Reviewed-by: hjk <hjk@qt.io>
2023-07-11 07:04:48 +00:00
hjk
96506f1f6a Utils: Further split StringAspect and FilePathAspect
... by introducing "proper" FilePathAspect::value() (and therefore
hiding the inherited StringAspect::value(() and a temporary stringValue()
for the transition period for the remaining users of the QString value.

Change-Id: I40cf4238a09a9009cda0decba1acac82bd730233
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-11 06:30:11 +00:00
Christian Stenger
fdf79f0234 AutoTest: Avoid crash on concurrent access
Partially reverts 91bdbb61ec as
the symbol lookup will update the snapshot's cache. As there
are concurrent threads accessing the snapshot we may end up in
a crash.

Change-Id: I2aaf5e403b10cba2b26915cbe7b4712c43c4957b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-11 06:28:20 +00:00
hjk
ebda2068dd Revert "Utils: Move a few FilePath-only functions from String to FilePathAspect"
This reverts commit e8617dc0c0.

Downstream AppManager still uses a combined String/FilePath aspect
version.

Change-Id: I9de08785120622d76daaa7c4be20fb5abb933095
Reviewed-by: hjk <hjk@qt.io>
2023-07-10 16:17:14 +00:00
hjk
a8a68b024a ProjectExplorer: Use less indirection for BuildConfiguration aspects
Change-Id: I6c219bc35edccd723f39e71d52b246060c1c424e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-10 15:35:03 +00:00
hjk
f1a6135c1e Conan: More direct aspect use in ConanInstallStep
Also fix use of a the potentially remote conanfile by using
only the .path() when passing to the (remote) install step.

Change-Id: If588dc8e2777a9c6515845886d9f3a9ab881c97f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-10 15:19:32 +00:00
Alexis Jeandet
d4260dab85 Ensure that target name is relative to build dir and without leading '/'
Fixes: QTCREATORBUG-29349
Change-Id: I7471242cd422a68a2652ff23741d0615380e2e8d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-10 14:55:41 +00:00
hjk
27d783fd1e Nim: Use aspects more directly in NimRunConfiguration
Change-Id: I4120f86d36ece183c95325ccea33cb66778753db
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-10 14:17:59 +00:00
hjk
9e84b09e99 Valgrind: Some more direct FilePath use
Change-Id: I99db6996482cd5a14dcc4d68c55b22c64feef9fa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-10 13:23:11 +00:00
Alessandro Portale
6ad4761604 Vcpkg: Prevent user from re-inserting a preexisting dependency
If the selected package already exists as dependency in the project, the
dialog shows an info label and prevents re-adding of the package bz
disabling the OK button.

Task-number: QTCREATORBUG-29333
Change-Id: Icd368bb2b0bde72ebe5efaea6a81e3cf96830ce3
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-10 12:47:22 +00:00
Alessandro Portale
d9680baf2a Vcpkg: Implement adding of dependencies to vcpkg.json
Instead of just inserting the package name at the cursor position, Qt
Creator now attempts to append the package name in the dependencies
array.

With auto tests.

The "interesting" effect of this is that the order of values inside
a Json object may change. Qt seems to enforce an alphabetical order
on the key names.

Also the indentation becomes 4 after the modification.

Task-number: QTCREATORBUG-29333
Change-Id: I803ca6a19ee32aeba95640726ac8d8e477750bc0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-10 12:47:10 +00:00
Alessandro Portale
e85e6c4701 Vcpkg: Use vcpkg logo icon for search vcpkg package dialog
Task-number: QTCREATORBUG-29333
Change-Id: I0dca734bdb7a328d97744c21d87de23d273a96b7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-10 12:46:53 +00:00
hjk
e8617dc0c0 Utils: Move a few FilePath-only functions from String to FilePathAspect
Change-Id: I682e158186a1ea7e374c9f0480e292018af07200
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-10 12:39:38 +00:00
hjk
66018f10f3 Terminal: Use one aspect more directly
Change-Id: I0767b66b6fa015535876e3ed67495e941631117b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-10 12:36:52 +00:00
Christian Stenger
0c77d981b1 Beautifier: Fix usage of static function
Do not use derived method from base class by accident.

Change-Id: Ic715d4ce92c50e001b4280234dcd6949862f192b
Reviewed-by: hjk <hjk@qt.io>
2023-07-10 12:25:16 +00:00
hjk
5545c93ad1 Beautifier: Move functions from settings to tools [3/3]
Change-Id: I579af5bf7db6f8ed50efdadf7037affdda458c74
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-10 12:21:36 +00:00
hjk
d672d70732 Beautifier: Move functions from settings to tools [2/3]
Change-Id: Ie0773c99d9f2c814da124259c015d7d0fdc1b497
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-10 12:20:57 +00:00
hjk
7596a91f31 Beautifier: Move functions from settings to tools [1/3]
This is a preliminarily renaming files to keep diffs small.

Change-Id: I5fc25bd2435a48f1ac3e2f22287004a0f2c8dd16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-10 12:20:20 +00:00
hjk
28e9591052 Perforce: Use more direct check for executable presence
The !isEmpty check is actually redundant, but currently cheaper than the
diversion through FilePath::fileAccess().

Change-Id: I44e6ec128c78cccf57c7276da70577a87b8c2f96
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-07-10 12:03:28 +00:00
hjk
5f9408ee8d CMake: Move some functions from build system to build config
Less indirection.

Change-Id: I3a0a41c360b051cf0a3021d57d437fbde8f0736e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-10 11:50:42 +00:00
hjk
dbdd6a0701 CMake: Pass CMakeBuildConfig to the settings widget
... instead of the build system. Less indirections overall.

Change-Id: I59b2fd4508b24a72357426439cac7fbd563e05bf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-10 11:50:10 +00:00
hjk
b9cf021b8e CMakeProjectManager: Use aspects more directly in build configuration
Change-Id: I35b9a31c158cac8eccb44ffb3f4e2d21d8183b8b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-07-10 11:48:30 +00:00
hjk
afe8b19996 Beautifier: Move a few strings closer to their use
Change-Id: I11c49976eca820b7083d143dbce6603085f9aa9d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-10 11:39:33 +00:00
hjk
dcca810fdc VcsBase: More FilePath use
Change-Id: I070c356306e19375cd871b7b4525f5d2de33b2a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-07-10 10:52:08 +00:00
hjk
2c512625c5 FakeVim: Delay settings creation until actual use
Task-number: QTCREATORBUG-29167
Change-Id: I3a6f1330922f3840cb7e99d8adb60a728d36eb4b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-10 10:31:14 +00:00
hjk
6a068a6509 Beautifier: Merge ClangFormat style file pairs
Follow ArtisticStyle.

Change-Id: Ie4e1ce260ce0cf451ad6e01ad5284b848bca206e
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-10 08:58:39 +00:00
hjk
694d81ad63 Autotest: Adapt to changed settings access pattern again
Settings are created on first access now, even though this
doesn't matter much here as this happens unconditionally in
AutotestPluginPrivate ctor via m_frameworkManager.synchronizeSettings()

Change-Id: I340927cf107d7e4b2268e842d23f1a89898e8a92
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-10 08:13:37 +00:00
hjk
60fb0fd902 Beautifier: Merge Uncrustify style file pairs
Follow ArtisticStyle.

Change-Id: I599e70912a5895ce8c59a5b2df2f3ccb4b291d01
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-10 07:57:25 +00:00
hjk
c8d9b6f5aa Beautifier: Merge Artistic style file pairs
... to prepare moving the "unusual" functions off the settings/
AbstractSettings base.

Change-Id: I4875bae9f3cec2105eb6d29493d6a6e706c414a7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-07-10 07:57:10 +00:00
Eike Ziller
3d3c78dfc6 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: If3ada34dcc764fa1d0cce04fd343fb5a02c2fbaa
2023-07-10 09:29:51 +02:00
Jarek Kobus
9039ede034 FileExtractor: Remove Utils namespace specifier
In order to limit the verbosity: add using namespace Utils instead.
Remove some unneeded includes.

Change-Id: I446da2324803fd4ac6fb854ce7626d497f9797f3
Reviewed-by: hjk <hjk@qt.io>
2023-07-10 07:21:02 +00:00
Orgad Shaneh
3745394fde Bump version to 11.0.0
Change-Id: Id20c9efb437a919d5d8a2f97b873f21468b0c5d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-10 06:13:10 +00:00
Jarek Kobus
1d8c0c8319 BuildManager: Introduce BuildItem helper struct
Don't keep 3 separate lists for build steps, enabled
states and build step names. Use just one list with
BuildItem struct. This quarantees the lists don't get
out of sync.

This fixes a possible issue in case when
abortBuildAllOnError is false. It could happen that
the front build step was removed from the m_buildQueue,
but the front items from the m_enabledState and m_stepNames
lists stayed there.

Change-Id: I9dc27a94b2961d3a190f1acfb6241bcdd1c41d1c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-09 18:39:55 +00:00
Jarek Kobus
a119242771 AbstractRemoteLinuxDeployStep: Get rid of run preparer
Make it a part of isDeploymentNecessary() instead.

Change-Id: I73bda4f75b94222b6e9475b13a373f7237969999
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-09 18:39:43 +00:00
Jarek Kobus
243341df46 AbstractRemoteLinuxDeployStep: Get rid of CheckResult
Use expected_str<void> instead.

Change-Id: I93518da9ba9393a3db84aefeb9edd164cd830d42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-09 18:39:14 +00:00
hjk
c1c62d0d9e ProjectExplorer: Add a comment about potentially unexpected expansions
Change-Id: Ie476a7c127c457e7a12336827876768432ffd658
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-07 15:34:58 +00:00
hjk
6f17409b53 ProjectExplorer: Code cosmetics in toolchain.cpp
Mostly namespaces, but also centralize access to the factory list
for better debugging.

Change-Id: Ic8b19b8c110dc925e0f7ae27af1da2b9e1ec6086
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-07 15:25:29 +00:00
Christian Kandeler
ba35a64d93 ClangCodeModel: Remove dead code
None of this had any affect after switching to clangd.

Change-Id: I806682fecff84bf6eb0b0eb382e096fc9a25fa3d
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-07-07 14:09:50 +00:00
hjk
3e155919eb CMake: Use current pattern to access main settings page
Change-Id: I95c556bebe1d583879b6702f727d9a859b9a4bcb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-07-07 12:57:27 +00:00
David Schulz
0822f28998 Python: improve python interpreter wizard page
Change-Id: I38215f1aaefbccc4e8c22957bf85c01e68df3c1a
Reviewed-by: hjk <hjk@qt.io>
2023-07-07 12:57:17 +00:00
Christian Stenger
7a518dc1b8 Nim: Make the command information usable
Change-Id: I68b7e589842f9cb3a423f2d81f9343ecd518f9db
Reviewed-by: hjk <hjk@qt.io>
2023-07-07 12:53:29 +00:00
hjk
3057fa4049 Nim: Use arguments aspect directly in NimbleBuildStep
Task-number: QTCREATORBUG-29168
Change-Id: I26a343cd9b88f3b199cfecbd6020aed67a5db33b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-07 12:46:57 +00:00
Leena Miettinen
03987976b1 Doc: Move output view docs to separate topics
- Move some information from "Viewing Output" to the "View output"
  how-to topic
- Add the output view topics to \ingroup creator-reference-output-views
  and \ingroup studio-reference-output-views

Task-number: QTCREATORBUG-29361
Change-Id: Ib91373015f416bf4eb6f5f5123a4ae6e5ebe8d8e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-07-07 12:34:32 +00:00
hjk
5330e4bc31 Autotools: Use string aspect directly in configure step
Task-number: QTCREATORBUG-29168
Change-Id: I5c9a69fff51f01d5498eba6bbdf676be22fe5e82
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-07 12:25:36 +00:00
Christian Stenger
03bab5814b Nim: Fix typing in path chooser
Silences a soft assert and re-allows to type paths
containing more than one directory separator.

Change-Id: I36c400e32b39206669278b89ab4bb033a1f0b6f6
Reviewed-by: hjk <hjk@qt.io>
2023-07-07 12:21:34 +00:00
Christian Stenger
5e55e70f52 RemoteLinux: Guard against nullptr access
This fixes a potential crash when switching the device of a kit.

Change-Id: Ibdce9859cb347401706fe4de1c56aa8bb890233b
Reviewed-by: hjk <hjk@qt.io>
2023-07-07 12:21:28 +00:00