Commit Graph

81945 Commits

Author SHA1 Message Date
hjk
8ba6f11e9c Boot2Qt: Use aspects more directly in QdbRunConfiguration
Change-Id: I8a199f449824ff973f5278f39172307be0e11438
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 14:01:57 +00:00
hjk
323f29a3bd AutoTest: Merge settings and tools hierarchies [2/2]
Renaming files to match class names.

Change-Id: I3d75a79a5ad8e9d1c132530cbcc6973efc6dbadf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 13:08:28 +00:00
hjk
0b83f110f4 CppEditor: Make a few CppModelManager functions static
... to simplify code using it.

Change-Id: Ib2bfbb5a17a1d48088a9cf4973d4c3f006cd34e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-12 13:08:09 +00:00
hjk
8f82e76ba1 ProjectExplorer: Centrally disable X11 forwarding aspect on windows
That's only the default value, but basically what all user code
occurrences do.

Change-Id: I2997744cf069455294ac35871109edc4328a1996
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 13:06:55 +00:00
hjk
90ba140545 CplusPlus: Use plainer callbacks to interact to the CppEditor
Lets us remove a few explicit CppModelManager::instance() call
in user code later.

Change-Id: Id8d846d06a0715b3d609cc5d52cc031e1d025fb1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-12 13:00:48 +00:00
Christian Kandeler
1d59a37acb ClangCodeModel: Fix outdated message
... after applying a clangd warning suppression.

Change-Id: I6b6605edd80080dcfd070b4a2f4219463674421b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 12:57:06 +00:00
hjk
14e18fc92f AutoTest: Merge settings and tools hierarchies [1/2]
Currently living in the settings files to keep changes small,
will be renamed in a second step.

This allows the settings aspects to be used in their short form
and overall removes some indirections.

Change-Id: I099369b62239aed8192613a04bca958a660c36c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 12:12:17 +00:00
hjk
345c946255 ProjectExplorer: Use direct aspect registration in ProcessStep
Task-number: QTCREATORBUG-29168
Change-Id: If83acc092689a935cf81c8133d6a07d802a07177
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 11:42:34 +00:00
Alessandro Portale
f3654b8fd2 Autotest: Use LayoutBuilder in ProjectTestSettingsWidget
Change-Id: If9f67564323835334e123178806467a999ab73a1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-12 07:44:14 +00:00
Eike Ziller
9144706000 Make showing tool tips for menu items more widely available
Change-Id: Ic9fcb61917c955a2b114c3a355dbdf5c291d75f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-12 06:34:51 +00:00
Eike Ziller
5b79efd0d6 Tasks: Save TaskCategory objects in the model
So data can be accessed more directly, instead of going through
individual methods categoryIds and categoryDisplayName.

Change-Id: Idb36050762e507480ba69de6a32b5f6f9bec8b75
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-12 06:34:40 +00:00
Eike Ziller
cd1b6a669b Tasks: Create a container class for category data
Reduce the number of arguments that need to be passed around.

Change-Id: I9fbfdcdf7b20f8f26e35f435bf8d65ba483e4114
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-12 06:34:25 +00:00
Alessandro Portale
918978ce89 Android: Remove unused androiderrormessage.h/.cpp
These have been added 10 Years ago with the plan to use them soon after,
but that did not happen.

Amends: db78293e7f

Change-Id: Ic916eafba56cbb5e4d1dadfb63222fa2870fbd2c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-07-11 19:15:12 +00:00
hjk
200ae0b40b Qnx: Use Aspects more directly in QnxRunConfiguration
Change-Id: I450144e91842792cc5841b2fb61e8fc39b0daa1e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-11 12:42:33 +00:00
hjk
cf7b2fb822 RemoteLinux: Add auto-registration ability to RemoteLinuxEnvironmentAspect
Change-Id: Ifec10445427c2f8125c29cdb4db44d45a99e6453
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-11 11:48:21 +00:00
Marcus Tillmanns
abf2234e4f Utils: Add ToolBar to layoutbuilder
Change-Id: I26ce85f73e625508d816c0e361a6afc65adf65ff
Reviewed-by: hjk <hjk@qt.io>
2023-07-11 11:37:23 +00:00
Cristian Adam
c914e5f9c2 Wininterrupt: Add explicit stdlib.h include statement
strtoul is found in stdlib.h and with the llvm-mingw toolchain it
fails to compile due to the stdlib.h header not being indirectly
included.

Change-Id: I85fc5e5828c859572ff1ce2c050556bc087de277
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-11 10:35:50 +00:00
Cristian Adam
80196abd6f CMake: Remove Windows 8 WINVER / _WIN32_WINNT defines
This was required for older MinGW toolchains.

Change-Id: I89e048adf01fa2b04c52715f71bf266cbd65c44e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-07-11 10:35:46 +00:00
hjk
ed93cff3ba ProjectExplorer: Allow to specific target device for EnvironmentAspects
Similar to what is done for ExecutableAspect.

The device related part is here not used yet, as only run related
setups are affected. This might change with an attempt to unify
EnvironmentAspect and RemoteLinuxEnvironmentAspect.

Change-Id: I6a620ad1d3443f0e8201c2572689edda1f84593c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-11 09:40:27 +00:00
hjk
e1ca7cf53f Utils: Let registered aspects know about their containers
Will help to set up macroexpanders with less boiler plate.

Change-Id: I521af3dc9d49524cf855e82eecc0132d1bcc40db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-11 09:37:17 +00:00
hjk
6346952380 Beautifier: Make sure version update process finishes
Change-Id: Ifd6fcee56d03f2853c7b196e8dade650f4e60e55
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-07-11 09:29:12 +00:00
Alessandro Portale
dbfc2a3242 Core: Use LayoutBuilder for FancyTabWidget
Change-Id: I01905732563807715eec21879e5a1c8c6fc2b5fe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-11 09:12:13 +00:00
Jarek Kobus
d171e6da69 AbstractRemoteLinuxDeployStep: Make some overrides final
Move some methods into protected section.
Do some cleanup.

Change-Id: Ica6f6fd181334c450666049c10d9ecc1ea16ea5c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-11 09:10:52 +00:00
Christian Stenger
0c40bd3e99 McuSupport: Denoise McuBuildStep
Change-Id: I519984d7bbdb84b1436184dc0bbd04be0967c3e5
Reviewed-by: hjk <hjk@qt.io>
2023-07-11 08:39:56 +00:00
Jarek Kobus
ed86673e84 AbstractProcessStep: Hide some methods in protected section
Change-Id: Ibc306288c35c4826123b6146e568d55d533e07a9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-07-11 08:33:19 +00:00
Jarek Kobus
06a57f8c42 BuildStep: Store the BuildStepList field
Don't rely on qobject hierarchy casts.

Change-Id: I7152252c882805fea0bc82e8f1205a964bfdfd93
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-11 08:26:51 +00:00
Jarek Kobus
6a8fe161cb BuildStepList: Pass ProjectConfiguration into c'tor
Instead of relying on parent-child qobject hierarchy.
Add explicit BuildStepList::projectConfiguration() getter.
Add explicit Target arg into ProjectConfiguration c'tor
and avoid qobject_cast.

Change-Id: I0b3105f7f8aea950e9679857887baffe9b321a33
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-11 08:24:15 +00:00
Jarek Kobus
02ffee322b AbstractRemoteLinuxDeployStep: Make recipe return GroupItem
There is no need for extra nested Group item in deployRecipe()
overloads, as sometimes it's just one task, like in case of
QdbStopApplicationStep or CustomCommandDeployStep.

Change-Id: I89cdb703c24198f3cbdfb17d0317e40f1929c376
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-07-11 08:02:46 +00:00
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
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
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
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