Commit Graph

47434 Commits

Author SHA1 Message Date
Christian Kandeler
c63148fa21 CppTools: Export some symbol search-related functionality
We want to re-use it elsewhere.

Change-Id: Iefd8464c56ddc8bb2fc5a3349cd833b094c61da7
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-03 07:24:05 +00:00
Christian Kandeler
248ebb494d LanguageClient: Expose server information
Server name and version are potentially interesting information.

Change-Id: I4fc9a2556d7fd8285fe0024cf0f83baf95112e65
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-03 07:23:24 +00:00
Tim Jenssen
8eb5a08c1b qmlpreview: adapt to new location of debug translation protocol
Change-Id: I6bcb6e9f18724f22b10586a6550fada991ca8678
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-05-03 07:17:57 +00:00
David Schulz
ec2449cae4 TextEditor: move snippet overlay into own cpp file
Change-Id: I3343d9abf19e4edc7bd88077bf8fe6666a901e1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-03 04:11:07 +00:00
Cristian Adam
7880950eca PCH build fix when building with Clang 12
Clang 12 has added a template parameter as "CALLBACK",
which conflicts with the Windows "CALLBACK" define.

Change-Id: I773899d103dcb1a852b555a1900b2de4acb6d96f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-02 11:38:01 +00:00
Eike Ziller
ed6b3f2bcd Revert "ProjectExplorer: Remove toolchain settings compatibility with <= 4.3"
This reverts commit 6baf09bf91.

sdktool still writes the toolchains with the old settings key.
This should be changed in a follow-up commit, but since we missed
updating the key used in sdktool, we have to stay compatible with that
for a longer while still, or we break lots of existing Qt installations
out there (specifically Boot2Qt, which is the main user of the sdktool
operation).

Fixes: QTCREATORBUG-25647
Change-Id: Ie665c9db5fd5bb808f510c53fd4173b8a318bb7c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-04-30 12:04:52 +00:00
Christian Stenger
db428da751 Docker: Fix qbs and cmake build
Change-Id: I61310e2736e9b5960620c1d55b268f57644b9832
Reviewed-by: hjk <hjk@qt.io>
2021-04-30 10:32:02 +00:00
hjk
fe8fbf1a4a Utils: Add a synchronous property to QtcProcess interface
Use it to avoid IDevice interface clutter.

Change-Id: I4a04f04e2c343593d937a402060e56ef94fcabf1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-30 09:16:12 +00:00
hjk
ba36cbfdaa Docker: Implement some DockerDevice functions
Container file system accesses are primarily done through the host
file system by prepending the appropriate path.

This is Linux-only, and only in case the volumes are mounted to
the same relative location in the container.

As a fallback, provide the functionality also via 'docker exec'.
This is, however, too slow to be used in the future.

Change-Id: I23185ae45184cb7b1de7c723a01ab96fe9c0801e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-30 09:15:08 +00:00
hjk
574de2eb2a ProjectExplorer: Adapt default make command to actual device
Change-Id: I40b9f0ee85b91b95d0b16e62e20c7c8c0ec8b77e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-30 08:01:26 +00:00
hjk
31f6b6fbe3 ProjectExplorer: Fix gccInstallDir detection on devices
Change-Id: I5a7085a03304c1e90c7e81686578fa4d98857670
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-30 07:58:57 +00:00
hjk
4564b2c36c Git: Avoid one use of SynchronousProcess
The synchronity was not used anyway.

Change-Id: I9e724d7c01e7e89c12954ac9e2b213c65302d942
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-30 07:58:43 +00:00
Thomas Hartmann
f22ae0a726 QmlDesigner: Support QtQuick 6.0 import
Change-Id: Ie6e752d58fb5a0c7989ab5c47166c6d08937d8d5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-29 20:46:58 +00:00
Thomas Hartmann
005b604b9c QmlDesigner: Allow larger major versions
With this patch we show items in the library
also if the major import is larger.

Change-Id: Id1f40a616971d322a1e99bf512ef802c14e88283
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-29 20:46:46 +00:00
hjk
999d22084d ProjectExplorer: Make runGcc work remotely
Plus a style nit.

Change-Id: I6f329926196cdbd9938e35437ab2be4e5bd1adc6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 15:09:48 +00:00
hjk
5470d5d8d7 ProjectExplorer: Allow partial remote ABI detection
The "Mac static library" case from 2011 (c9f7d779a6) is still
local-only.

Change-Id: I5b437722bc1946458f54f3bdaf3e087f9264842a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 15:09:37 +00:00
hjk
76675d9384 ProjectExplorer: Include device into default gcc description
Change-Id: I2dcea9baa3693b7046e0223b66d0160a3a6b32d7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 15:09:28 +00:00
hjk
1366a9ad75 ProjectExplorer: Prime the file and process re-routing through IDevice
This patch injects the hooks that let Utils::FilePath and QtcProcess
divert their operation to IDeviceManager which in turn looks for a
device feeling responsible for a given "global" path to do the actual
work.

Change-Id: Iecc1209f0475dbdf93d6f6243714d394a30fec74
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 14:39:10 +00:00
Christian Kandeler
dabfd6c0ed Fix libexec path construction
Fixes: QTCREATORBUG-25648
Change-Id: I5da2cb1b2809f29a676a3929ce5967afb5601cd9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-29 13:04:54 +00:00
Eike Ziller
198b412ff2 Fix margin of Open Documents view built with Qt 6
If an item has an empty QIcon as decoration, Qt 6 does not add a margin
to the left. Use an empty QVariant for declaring "no decoration"
instead, which is semantically better anyhow.

Also set rootIsDecorated to false instead of setting the indentation to
0, since that is what we actually mean.

Fixes: QTCREATORBUG-25253
Change-Id: I33f4c25394bb61f9f56d375c59453b3434620d0d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-29 10:38:29 +00:00
Jarek Kobus
564d2666c3 Fix build with GCC 11: include <limits>
Task-number: QTBUG-90395
Change-Id: Ic6d3fde59bd44d364ca1c1fe48b094bb9768b43c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-29 09:55:51 +00:00
hjk
74f8da1cd4 ProjectExplorer: Add ProjectConfiguration::mapFromBuildDeviceToGlobalPath
A convenience function to help making buildsteps etc. work with
container setups.

Change-Id: I0aca129ee0ed4eb70c7ec9dcebead42b73651dc3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 08:42:06 +00:00
hjk
8e2522f290 ProjectExplorer: Better start/stop messages for remote commands
Change-Id: I749e178d87e1721b09b8a6d867ab799967acad7c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 08:41:40 +00:00
hjk
19600b12c4 ProjectExplorer: Make the DesktopDevice responsible for local accesses
Change-Id: I92337d9acec25e6e72d367c14ca0d85827c570c2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 08:39:02 +00:00
hjk
9285b1e7c9 ProjectExplorer: Prepare IDevice to re-route file and process functions
Unused for now.

Change-Id: I4ae7ec0e5f4f7807ef4137e5fb5a68804d6bb124
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 08:38:50 +00:00
hjk
2299574e82 ProjectExplorer: Fix warning for missing build device
Change-Id: I91583699dec9da96fac1cc8fc40f6b49b4ae7589
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-29 08:37:28 +00:00
hjk
28bf6f98cb ProjectExplorer: Extend toolchain validity check to remote setups
Change-Id: I4843a1c1dcb8191435469bd9f1b62f9fa09e5e14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 08:35:50 +00:00
hjk
85930c03d2 ProjectExplorer: Persist remote toolchains properly
Change-Id: I9582e9d94a4d858205e90dfe9bfa4a4fa621b191
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-29 08:29:22 +00:00
Christiaan Janssen
a4c1bdeb71 McuSupport: remove experimental flag from plugin metadata
Task-number: QTCREATORBUG-25632
Change-Id: Ic1b550abd30b072f44ee9c3bfa4c0e5a389f3c34
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-29 08:13:27 +00:00
Christian Stenger
ca04d9afcd CMakePM: Fix compile for gcc 7
Due to a compiler bug the content of the raw string is
handled inside the preprocessor and the cmake comments
end up as being noticed as unknown preprocessor directives.

Change-Id: I3f235cfdd0799a6bb94743e2910663d9b0d3385d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-28 09:53:09 +00:00
Christian Stenger
e38c34029f TextEditor: Fix missing include
Amends c8f8513c8d.

Change-Id: I5c82c2f91d71425e5333e0248582ee9fe4f2ee28
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-28 08:41:52 +00:00
hjk
e00bd017a9 ProjectExplorer: Display full path for make steps
Including the bits related to remote devices.

Change-Id: Ia5b94edf43c9f33849a715263e280fd88815fabe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-28 08:36:34 +00:00
hjk
3cad2b8c74 QMakeProjectManager: Show full make command path
... including the bits referring to a device.

Change-Id: I1043a1b64e04a0d8ace45c71edc324189e93ddb0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-28 08:36:25 +00:00
hjk
509f40825a ProjectExplorer: Pass device to ToolChain::autodetect
Currently unused, will be useful to detect toolchains in docker
containers.

Change-Id: I0fd7643969ab02c05839332a436147ffb242635d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-28 07:59:45 +00:00
Orgad Shaneh
f0bdead363 Git: Fix crash when opening git grep search result with tree
... if the contents is unchanged.

Amends commit eb6a2f2b89.

Change-Id: Ief59a2ea2feeafa5834035402d461faf3c3c0e9e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-28 07:38:57 +00:00
David Schulz
c8f8513c8d Snippets: Split error messages out of the parsed snippet
Change-Id: Ic5d6664c86405c558e8bb133b854521e4eaef58a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-28 07:37:24 +00:00
Eike Ziller
b3bd8b81c4 CMake: Do not remove "Current executable" target
The "Current executable" target is an artificial target added by Qt
Creator, so we must not remove it because it is not one of the targets
from the project.

Amends dbb5a70f93

Fixes: QTCREATORBUG-24145
Change-Id: I4601bcbc7238c6bf54bc9aa3ef6eb934b65df96e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-27 13:09:10 +00:00
David Schulz
64a15b97b7 ProjectExplorer: refine toolchain abi check
Filter out toolchains targeting a different word with or architecture
than the Qt version.

Change-Id: Iac2fb1b30d493e10dc4bd92b5585bbb9faa76d4a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-27 10:39:48 +00:00
Marco Bubke
c4c3d4cc33 QmlDesigner: Remove findInSorted function
Using std::lower_bound is more generic and we have less code which
could lead to less bugs.

Change-Id: Iacf6ea550182b51a8d5dd6b18a92de68914f4df1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-27 10:26:03 +00:00
Marco Bubke
3862f67b8d QmlDesigner: Improve storage handling in StorageCache
Using an explicit class for the storage not even makes the code easier
to understand but enables the possibility of code optimizations too.

Change-Id: I9239919d3385ba1bf141c23bdc3013b6c1e624ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-27 10:25:58 +00:00
Andy Shaw
df540d5611 Remove the inline keyword when moving implementation to cpp
Since the implementation has been moved to the cpp file, then
the inline keyword has to be removed otherwise it will cause a
build error.

Change-Id: I145bbaeb02674bd68501f1a41787bd4aa2a75f53
Fixes: QTCREATORBUG-20703
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-27 10:21:41 +00:00
Christian Stenger
318b3f10ce Unittest: Fix build
Amends 8e352af0ec.

Change-Id: I8130996fa68d9a5fa4217a8db001745a0382f91b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-27 09:09:49 +00:00
David Schulz
1d7e05e6a9 LanguageClient: remove unneeded document actions blocker
Change-Id: Id1f07dbf83fcf7d75aaba6d860fb1556761bbd4b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-27 08:38:16 +00:00
Christian Kandeler
91b6c58518 LanguageClient: Add signal to inform about WorkDoneProgressEnd
... and make use of it in the clangd client to be able tell when
background indexing has finished.

Change-Id: I0f3c6f9646fd66ababd08c12b2f347da5f1a3729
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-27 07:37:25 +00:00
hjk
8e352af0ec Core: Add a default parameter to various ICore::*path functions
Saves some code on the user side.

Change-Id: I32cd220b6e533f5497a1865f9c34ab9db4cfda79
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-27 06:52:05 +00:00
Marco Bubke
c236a25339 QmlDesigner: Add storage cache
Task-number: QDS-4237
Change-Id: I7d587f615b5e26cc6014ea3a63dedd203fdd35eb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-04-26 14:52:24 +00:00
The Qt Project
c23174f1fc Merge "Merge remote-tracking branch 'origin/4.15'" 2021-04-26 14:26:00 +00:00
David Schulz
a3c7adecd1 TextEditor: move ParsedSnippet out of snippet
Change-Id: I4e9c7d810fdd0904386f8d3b3481c0a4855c2021
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-26 11:48:47 +00:00
Marco Bubke
c471b5a3ea QmlDesigner: Change NodeListPropertyIterator::difference_type to qsizetype
Should fixes Qt5 <-> Qt6 differences.

Amends I743f942fb0bef9f907b4facbb346264dfeaad778

Change-Id: I7545936e6c5b725cedd0606039008f0c5bdbfdd2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-26 11:26:48 +00:00
Eike Ziller
2fe1e881ac Merge remote-tracking branch 'origin/4.15'
Change-Id: I44dad4bbe9ed955d35c713485720a3f36a21874d
2021-04-26 11:59:13 +02:00