Commit Graph

80111 Commits

Author SHA1 Message Date
hjk
f10a524f05 Remove some QList::toVector() no-ops
Change-Id: I4d7ecf26a2d18b7e58e8bbae8d1b12f3e73924d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-04-04 14:34:16 +00:00
hjk
2534226d26 RemoteLinux: Move RSyncDeployStep implementation out of sight
Not needed publicly anymore.

Change-Id: I07f36c2fb7f4f42a970c43a4c7ad957b0b1dfce1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 14:33:52 +00:00
Jarek Kobus
b571bf847c ModelEditor: Reuse CppLocatorData::findSymbols()
Instead of using CppModelManager::classesFilter().
Avoid reusing LocatorFilterEntry::internalData.

Change-Id: Ic59daa01b0596dee46ae4ae362e833aea4610546
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-04-04 14:16:24 +00:00
Jarek Kobus
605dfa23cd ILocatorFilter: Don't store IndexItem::Ptr as internalData
Currently it's never read.

Change-Id: If89486ad8ad74c3431fe420d83fbec9a22855f04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-04 14:13:26 +00:00
Alessandro Portale
06427a038b Android: Force reset/update of pre-existing toolchains
Toolchains are only (re-)created if the NDK changes. And till now, the
environment for the toolchain was only set during its creation.

However, if the user only changes the JDK location, we don't want to
recreate the toolchain but to still update the JAVA_HOME variable for
the environment.

This change does so that resetToolChain() is called also for pre-
existing toolchains (not just the newly created ones). That triggers a
call of addToEnvironment(), which sets the potentially updated JAVA_HOME
variable.

Fixes: QTCREATORBUG-28827
Change-Id: Id55f59f3ef3c8bfbb2b811052e0f60f495843dc3
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-04-04 14:00:17 +00:00
Alessandro Portale
a854c3d273 Debugger: Put DebuggerRunConfigurationAspect into a DetailsWidget
Mainly in order to put the fields into a visual frame. By default
expanded.

Fixes: QTCREATORBUG-27151
Change-Id: I9920d2c9f3872860e75e938ea90a9165aee5b92f
Reviewed-by: hjk <hjk@qt.io>
2023-04-04 13:55:09 +00:00
Jarek Kobus
031f51794a Python: Don't leak running futures on shutdown
This patch fixes the following assert on shutdown:
"Shutting down while process /testenv/bin/python is running\"\n".

Change-Id: I4c32ead5e4952b69ffc6037739fd417a632eda1a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-04 13:20:06 +00:00
Christian Kandeler
f019dd14e0 qbs build: Fix qtc module
There should be no symbol "Qt" in that module's scope; it's a qbs bug
this worked so far.

Change-Id: Iddf69669656b41fa7a7a96b2fae4f6584275812d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-04 12:25:19 +00:00
Marcus Tillmanns
ca0bee902f ProjectExplorer: Create BuildDirectory on device
The BuildDirectory is now assumed to be on the build device.

The default build directory template path is resolved against the
project path mapped to the build directory.

Change-Id: Ie1d147d135e9e551f2ac46cbec583374d524d2d7
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-04 12:17:49 +00:00
hjk
6977d28f55 RemoteLinux: Fix new port gatherer approach
We need the shell to expand the glob pattern.

Amends e0694c52d9.

Change-Id: Ibc8b7b68f52b17d1abe367f2b8672f40fd3bc1ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-04 11:37:14 +00:00
hjk
9c182911d3 PE/Qnx: Disentangle BuildStep factories from downstream further
The idea is to only expose factories with properties and not the actual
step implementations.

Change-Id: I72dc3944993f898f12b6a9bec11317f87e45c648
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-04 11:13:09 +00:00
Marcus Tillmanns
ee52d204e6 ProcessStub: Read correct channel
Change-Id: Ib26c75f069c90290f7930becdec42bf6ff5aa3d9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-04-04 10:52:39 +00:00
Marcus Tillmanns
53e8144330 Utils: Remove unnecessary code
Change-Id: I3844d71d3f77d49f7e84c4feae910679391fa91a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-04-04 10:33:11 +00:00
Robert Löhning
41c1b76af0 SquishTests: Stabilize tst_rename_macros
Change-Id: I9d77bf9daa66b46e2b16c8618e1848538cb797aa
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-04 09:51:26 +00:00
Robert Löhning
892ccd2097 SquishTests: Add function for finding elements of project tree
Change-Id: I08c3c22a404d2b58bdb1205f22e5cf937c6027b0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-04 09:51:01 +00:00
Marcus Tillmanns
4fbc56d453 Utils: Change macro expander to use FilePath
Change-Id: Ib7787d1b7f72f6b4728893636f6844e4297fcecd
Reviewed-by: hjk <hjk@qt.io>
2023-04-04 09:19:25 +00:00
David Schulz
4d688c932b Clangd: do not modify the default replacement string
Fixes: QTCREATORBUG-28321
Fixes: QTCREATORBUG-28910
Change-Id: I4cfaf5ea3916a0ecbf0b0bae4d0c231513671c73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-04-04 08:55:15 +00:00
Christian Kandeler
3c0c26f7b3 ClangCodeModel: Adapt to updated clangd tooltip format
The header file path is not the last line anymore;
see https://reviews.llvm.org/D146244.

Change-Id: Ifbc2b55c0a82c661454d487c287fe4fb5a950d38
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-04 08:53:57 +00:00
Marcus Tillmanns
a374dd8bfe Utils: Fix PathChooser validation
Change-Id: I5b0ad8a1011f51c5db732fe454c409812b406c17
Reviewed-by: hjk <hjk@qt.io>
2023-04-04 08:41:31 +00:00
Marcus Tillmanns
27fbe0c51d ProjectExplorer: Add device root path macro
Change-Id: Ie2a046c71194d2af20fb8483440bd0ffa22fda0f
Reviewed-by: hjk <hjk@qt.io>
2023-04-04 08:26:05 +00:00
Jarek Kobus
36463f3c87 CppLocatorFilter: Don't repeat CppLocatorData arg in c'tors
It's always the same instance of:
CppEditor::CppModelManager::instance()->locatorData().

Change-Id: I7d8aa2da6f0055d91b519efb6ebdf2177794e0b7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-04-04 08:08:09 +00:00
Jarek Kobus
f83dbc3316 CppModelManager: Avoid using ILocatorFilter::allLocatorFilters()
Use dedicated CppModelManager::functionsFilter().

Change-Id: Iafc93ae9d1d1f6a4767289238e2fd36b276611c2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 08:00:47 +00:00
Marcus Tillmanns
07a6d53daa ProjectExplorer: Add BuildConfig::BuildDirectory
Change-Id: I7a05d8199c0ec12142438b4f23857abda14b87f6
Reviewed-by: hjk <hjk@qt.io>
2023-04-04 08:00:27 +00:00
Jarek Kobus
16b9539a40 CppLocatorData: Introduce findSymbols
Reuse it inside cppquickfixes.cpp. Don't use global
CppModelManager::classesFilter, but more specialized and
much faster CppLocatorData::findSymbols.

The return value of CppLocatorData::findSymbols is a list of
IndexItem::Ptr instead of LocatorFilterEntries, so that we
may avoid using internalData for passing IndexItem::Ptr.

Change-Id: I14591b3fcf4de34d6fea23b9f354fe898123c9af
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 07:50:10 +00:00
Christian Kandeler
0319542937 ClangCodeModel: Do not try to rename macros and namespaces with clangd
Unfortunately, clangd refuses to rename macros and namespaces.
Fall back to our old two-stage "find + replace" approach for macros
(which clangd can find just fine) and employ the built-in code model for
namespaces (as they don't get indexed at all by clangd).

Change-Id: I08b1088ff4de9220427e089ef0700dbf2a944081
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 07:26:49 +00:00
hjk
432d8e6e63 RemoteLinux: Proper double-remote
There seems something wrong with quoting the sed command for port
access which should be fixed independently.

As it is not crucial for plain deployment / run, make the test optional.

Change-Id: Id82bdc7c25a7fb6e2f8799676b869216a7720cfa
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-04 07:01:39 +00:00
hjk
305ccfe259 Utils: Replace FilePath::onDevice() by new FilePath::withMappedPath()
Basically a.onDevice(b) == b.withNewMappedPath(a), matching the order
of b.withNewPath(a).

Whether the (curretly docker-specific) path mapping is useful /there/, and
whether some of the calls are needed at all is dubious. I added some
FIXME and changed a few cases directly.

Change-Id: I7514736ce922f632f1f737bc496f6783389a42b6
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 06:56:55 +00:00
Orgad Shaneh
9956740905 FilePath: Optimize string compare in setParts
Change-Id: Ibc390ee943ed41dfef30fbbd07e2e681d82379ba
Reviewed-by: hjk <hjk@qt.io>
2023-04-04 06:14:12 +00:00
hjk
0edf909b45 ProjectExplorer: Remove unconnected applicationTargetChanged
Change-Id: Id6a283118c904ad13e8bcfc4b23b9dd76b3cc83f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 06:02:59 +00:00
Marcus Tillmanns
b999e5700e Terminal: Fix docker cmd for terminals
* Fix env for terminals

Change-Id: Ie16a74aeca3ad34a76af1dee0c5a01e607aabebb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-04 05:59:35 +00:00
Marcus Tillmanns
f1f5a7412a Utils: Send __qtc marker from stub
Docker and ssh devices need the real process id on the
remote device. The process stub now send this if it receives
it as the first line of output.

Change-Id: I5d3af39651958fc88d21c3854a0fa1d7f51547a6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-04 05:59:25 +00:00
hjk
242d19c19d CMakeProjectManager: Give some hints why deployment data looks wrong
Change-Id: If42b32ca80f4144b86ff882e0db243ba9f0f5cbf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-03 14:39:36 +00:00
hjk
e0694c52d9 RemoteLinux: Allow parsing used ports from cat output
We used to run

     {filePath("sed"), {"-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*"}

on the device side but doesn't pass quoting on double-remote setups.
Chicken out by using a simpler for now command.

Change-Id: I7794f803d185bd4b6b717d85c01cc250cc66f1eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-03 13:50:35 +00:00
hjk
5715b8baec Debugger: Execute the non-installed gdb data-dir magic
... only when there's a hope for it to help.

Change-Id: I0b7215af371515a1eec8420fdf59e60037584941
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 10:15:31 +00:00
Robert Löhning
6ad3531b15 SquishTests: Handle expected failure of qml refactoring
Change-Id: I05b19c33de6e1245bfb6610f7a3fd39ba428aa28
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 09:27:50 +00:00
Robert Löhning
5c5e12981e SquishTests: Add an explanation about automatically created kits
Change-Id: I1bb351c56600fa4a6e420299bdbaff1c436d19c9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 09:23:39 +00:00
Christian Stenger
ea73bb9146 DeviceSupport: Silence soft assert
Change-Id: Ifa5bcbb799fcfeb25254a87a1e3e62bc8864bf4d
Reviewed-by: hjk <hjk@qt.io>
2023-04-03 08:12:03 +00:00
Marcus Tillmanns
94c4800ad8 Terminal: Fix crash when reusing TerminalWidget
Change-Id: I9d30df1abbecabd3909078e0a609fe5ba96769ae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-03 07:53:23 +00:00
Marcus Tillmanns
0015c666d2 Docker: Fix ensureReachable return value
DockerDevice::ensureReachable returned false in case a path was
already mounted.

Change-Id: I7b378a063dfe5380a1ead648f89911f2225c6338
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-03 07:34:40 +00:00
Marcus Tillmanns
18045f3fe0 Terminal: Close Pane with last Terminal
Closes the Terminal pane once the last terminal is closed.
Opening the pane again will also open a new Terminal.

Change-Id: I2f822b0058b26506250c784357ba522f29fd4078
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-03 07:34:26 +00:00
hjk
a8abb5ca50 RemoteLinux/Qnx: Disentangle deploy step factories further
Change-Id: I5d6c9a6de05bf8284be13f877642de39f7c3d22d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 07:08:50 +00:00
hjk
3cd0dad3d4 RemoteLinux: Set up GenericCopy step when sftp and rsync fail
Change-Id: Ia99275c9e1cabe06613a138dec87bd9c2f98b258
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-04-03 07:08:36 +00:00
hjk
e094e738b0 RemoteLinux: Have an extra simple echo test
First test without additional complications through quoting.
Makes debugging easier.

Change-Id: I3ea1a0725474fed09204fda1219cbc535bd2ef7c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-04-03 06:15:41 +00:00
Jarek Kobus
9bdddd3df7 Compile fix
Change-Id: If0a12d9e2b7d8782ecc65855285f95e05c816f39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-04-02 17:33:10 +00:00
Eike Ziller
7fc0dcec0d Fix lots of tr.h files not being mentioned in CMakeLists.txt
Change-Id: I63d364ac50d9587339b10a5571870cb9a81c54ee
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-04-01 04:25:17 +00:00
Eike Ziller
b635e99086 Merge remote-tracking branch 'origin/10.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/libs/utils/multitextcursor.cpp

Change-Id: I54b00ea5e6953078beed7673b5de31114f983bfa
2023-03-31 15:58:09 +02:00
hjk
c6565611d6 RemoteLinux: Don't crash on empty test output
Amends 95609cdd57.

Change-Id: Id316ccf1989ac7853bdb71b22351aec7fd12fe7a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-31 11:16:39 +00:00
David Schulz
82a4ea721f TextEditor: add a virtual destructor to TextSuggestion
Change-Id: I30378a5a3367a79eb3b39bc921c409ca0af04119
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-31 10:03:41 +00:00
David Schulz
7046890bcc Editor: ensure that the outline is the left most toolbar widget
Fixes: QTCREATORBUG-28765
Change-Id: Ifc43ed64ab4906af2d669ff372d8b66d59203048
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-31 09:32:04 +00:00
Orgad Shaneh
2d7fe61e7c ClangTools: Disable PCH
This plugin depends on yaml-cpp, which enables exception handling on MSVC,
so the PCH is inconsistent.

Change-Id: Id098ea115d71d787192319a6fd0ef7f2addd7ec6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-31 07:46:42 +00:00