Commit Graph

80509 Commits

Author SHA1 Message Date
Christian Stenger
677fd6ba9a Utils: Fix compile with MinGW
Amends fbb8d94e55.

Change-Id: Ib62733031bfed435592da57d7f52e10473953669
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 10:12:44 +00:00
hjk
f5dce50dae Conan: Convert to Tr::tr
Change-Id: Ibeb29c39923db0f1c95e0db41dd7b2a1f8d670db
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-10 10:11:40 +00:00
Jarek Kobus
f73e787bd1 ExecutableInfo: Share getClangIncludeDirAndVersion's cache
Share the common cache with ClangToolRunControl and
DocumentClangToolRunner.

Change-Id: I47c6a1844459e80e9ea0336b5aa72db0265d3a30
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-10 10:07:39 +00:00
Christian Stenger
7684571e10 AutoTest: Fix handling of data tags with spaces
Change-Id: Ie725d8bf67b6a143f52c84b902b69a077a55a2bc
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-10 09:49:40 +00:00
Christian Stenger
6e7c257a8c AutoTest: Fix checked state for QtTest
Data functions and special functions may get handled as normal test
functions which obviously fails when executing tests.

Change-Id: I630fedcdbcc7577c1896f8cccbe77008a623900f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-10 09:49:34 +00:00
Eike Ziller
8d6c168631 Fix build of Designer plugin
Qt 6 has Qt(6)::DesignerComponentsPrivate instead of DesignerComponents

Amends 55fa109b59

Change-Id: I96e152dd1e69095ca23784a5ac92f214b39fa608
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-10 09:44:45 +00:00
David Schulz
a298e11e0c ClangCodeModel: map compile commands json path to server
Change-Id: I0129bb0688980f986012445f418d07f1e4cea6ae
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-01-10 09:08:13 +00:00
hjk
66c08a824d Utils: Rename most FilePath::{from,to}Variant uses to {from,to}Settings
Specifies the main purpose more clearly. The remaining ones a "true"
(internal) variants in models and as action data.

Change-Id: I8dd3c846e419f29d88283c2f48268ef6685b19fe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 09:00:30 +00:00
Christian Kandeler
ca4af940b1 CMakeProjectManager: Provide generators
Task-number: QTCREATORBUG-28149
Change-Id: Iaebc04d729ccb3ec14496ae74ca6aa3d9aca8bac
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-10 08:47:10 +00:00
hjk
68b7276f86 CMakeProjectManager: Keep using Tr::tr
Amends ac2ca7244.

Change-Id: I2373767d842c18f68c141a7dce3eab641dd5061d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:27:56 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Marcus Tillmanns
aee7afd50b ProjectExplorer: Improve error reporting
Previously anytime a FilePath operation tried to access a device that
does not have a DeviceFileAccess an error message would be thrown.

This patch makes it possible to differentiate between the device not
being found, and the device just not having a DeviceFileAccess
interface.

Also the error message in DeviceFileAccess::exists() was removed as
its not an error to ask if something exists even if it does not.

Change-Id: Ib8c2e08132159d0d97bcd049b59436eb17bdbacd
Reviewed-by: hjk <hjk@qt.io>
2023-01-10 07:12:39 +00:00
hjk
ad2013eee5 Utils: Enforce use of semicolon after QTC_ASSERT_EXPECTED
Change-Id: I2fe6b60434f251e4abf7a13a535844a10f99c6a3
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-01-10 07:03:43 +00:00
Marcus Tillmanns
bf9e2110e6 LSP: Use localSource
This change allows the LSP to find a local version of a source
file even if the server is running on a remote device.

Change-Id: I274cb327ad958ac3c4486859da666702758b7d42
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-10 07:03:13 +00:00
Marcus Tillmanns
a9c1beed7a iOS: Cache xcrun location
runSimCtlCommand() is called quite often when the
user is in the settings. Trying to start a command without
a full path makes QtcProcess search for the file in all PATH
directories every time.

Change-Id: I7eac4226a74c78269ae66ab8d2a2af3589a98e36
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-10 06:38:41 +00:00
Christian Kandeler
b6bd59fc57 CppEditor: Add soft assert for unexpected semantic highlighter state
Task-number: QTCREATORBUG-28507
Change-Id: I322c9b806c85d2a013c4014c80f4ca11ca117752
Reviewed-by: hjk <hjk@qt.io>
2023-01-09 16:03:06 +00:00
hjk
f5e4b7bd9f Android: Remove unused function lldbServerArch
Change-Id: I2482d85b553dc394d689b823a2abea46fedb852a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-09 15:36:09 +00:00
hjk
538a906912 CppEditor: Add missing include
Change-Id: I559e07115eabf9c8bd22543422e59dbd3a574d06
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-09 15:23:19 +00:00
Eike Ziller
4e3eb5ab51 Merge remote-tracking branch 'origin/9.0'
Change-Id: Ia0277bbf54a46fa2ada16ef982aa11c448998293
2023-01-09 15:20:35 +01:00
Eike Ziller
ef798ae4eb GitHub: Use Qt 6.4.2
Change-Id: I79d570bbddd8498b26fff57fca1c90e99c06f540
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-09 14:19:34 +00:00
David Schulz
d62d39642e LanguageClient: Add action to restart client to editor toolbar
Change-Id: Ib2fb0f6d9a5b3baeac937f298670887fa704ddce
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-09 14:12:22 +00:00
Pranta Dastider
20cbf4d34b QmlDesigner: Update Tooltips for Component Section
This patch update tooltip text for Componemt Section fields.

Fixes: QDS-8724
Change-Id: Id3fed9163c4ad6e61b762a5760cd5f2d7c079183
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-09 13:45:34 +00:00
Artem Sokolovskii
e193d02a72 ClangFormat: Fix no style for a new project
Fixes: QTCREATORBUG-28655
Change-Id: I44794125cfb0e4f24dc9a573fa0f9bb29f4c2e2b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-09 13:25:56 +00:00
Jarek Kobus
13fa4d5c02 GenericDirectUploadService: Use ParallelLimit
Instead of subgrouping parallel tasks into groups of
MaxConcurrentStatCalls size and running these groups sequentially.
The advantage is that now the next task will run just after
some task has ended. Before, the next group was run when
all tasks in the previous group have finished.

Reuses new ParallelLimit functionality introduced here:
b6208ab34a

Amends f2d50ba6ff

Change-Id: I422c86184d62aefc92d94adb58cdb7b1e38232f2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-09 13:05:46 +00:00
Jarek Kobus
fb477d6567 CppIndexingSupport: Get rid of createSymbolSearcher()
Create SymbolSearcher directly instead.

Change-Id: I48b054654038a8f3033e858324666c649295e2d4
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-01-09 12:25:11 +00:00
Jarek Kobus
c3e0c387f5 SymbolSearcher: Flatten class hierarchy
Don't make SymbolSearcher a pure virtual class as there is
only one subclass.

Change-Id: I85a9d0fd3574e29620c1e6bfdb3b3421e19a4f76
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-01-09 12:20:47 +00:00
Jarek Kobus
63783f22c3 CppIndexingSupport: Flatten class hierarchy
Don't make CppIndexingSupport a pure virtual class as there is
only one subclass.

Change-Id: I9f216a2f1f5d04f601d07b9507a4e9cf27ff7c46
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-09 12:17:35 +00:00
Jarek Kobus
0c1077425f ClangToolRunner: Move some methods into protected section
As they are used only from subclasses.

Change-Id: Ic16ffe3af8417b74af8a0ad3ea7ed1219f1f3a01
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-09 12:14:35 +00:00
Jarek Kobus
bf864ff371 ClangTools: Get rid of OutputFileFormat enum
This enum contains only one value now, so it's no-op.

Amends 9fc2fda07e

Change-Id: Ifa144dafb6155db93c06e3faecc40e38e464dac0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-09 12:14:28 +00:00
Eike Ziller
b7731b58a8 MacroExpander: Generalize registration of project variables
We provide global macros for ActiveProject and CurrentDocument:Project,
but these were completely separate, and the CurrentDocument:Project one
comparatively incomplete. Unifiy them.

Change-Id: I2622012f2c760e9f5b328766eca9d64c0bf9c5b1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-09 12:05:47 +00:00
Miikka Heikkinen
df3ace009a QmlDesigner: Fix clearing node lock/eyeball
Lock/eyeball status was not propagated to puppet when lock/eyeball
was cleared, as clearing these aux properties instead removes them,
which triggers change notification with invalid value. Fixed by
allowing invalid value to be propagated for these properties.

Fixes: QDS-8735
Change-Id: Ic5c4818afeef71612f9620b3a0af503793a37e90
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-09 12:00:50 +00:00
Eike Ziller
23fa784e9c MacroExpanders: Remove legacy "Current(Project|Build|Kit)" variables
Should use "CurrentDocument:....." now.

Change-Id: Ie47f0e0f77b506bef6fc7a173aec8cfdcf863e5e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-09 11:55:08 +00:00
Jarek Kobus
37fafcabb2 SymbolSearcherTestCase: Remove unused toString()
Change-Id: I2bfca6f112a59008d75f38d6941f6d084aad1491
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-01-09 11:40:59 +00:00
hjk
a2d2150261 CppEditor: Re-use Symbol::filePath()
Change-Id: Ic958fc0b8916c1afe8b955b140a5cf76e971623d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-09 11:32:48 +00:00
Alessandro Portale
8ee463f311 Android: Remove extra spacings and margins from AndroidSdkManagerWidget
Change-Id: I74f35daa52b779504c859153482aabb5ae49521f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-01-09 10:13:56 +00:00
Marcus Tillmanns
f0540f8392 Docker: Convert isValidMountInfo to expected
Change-Id: I582939990f85c1dc3eed474b3bac0e6b4efe3367
Reviewed-by: hjk <hjk@qt.io>
2023-01-09 09:51:00 +00:00
Marcus Tillmanns
2cfc981860 ClangFormat: Remove setPath() from VFS
setPath was not used anyway. It is also not available in older
llvm versions.

Change-Id: I16f0a8e2ffa827d92a2f1440d27391a51aefa728
Reviewed-by: hjk <hjk@qt.io>
2023-01-09 09:35:10 +00:00
Alessandro Portale
a04b433489 Android: Remove lldb package handling via sdk_definitions.json
The sdk_definitions.json only briefly listed an lldb package. There is
no need to still support that.

Amends: 6bea157c9b

Change-Id: I6344ea6ed9dd80693d02e86033632dfd2582b773
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-01-09 08:30:42 +00:00
Christian Stenger
1802ad77a7 LanguageServerProtocol: Fix compile
Partially reverts bee489f9e2.

Change-Id: Ifdd4e2f85133ef6bf6c7871daedb8ecd64fdfa8f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-09 05:58:28 +00:00
Artem Sokolovskii
deeda4c9ed Android: Update "Android SDK Command-line Tools" version
From v6.0 to v8.0

Change-Id: I85a2b98bba3192abe2dc8f26043d42d768ea8a67
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-06 18:02:46 +00:00
Cristian Adam
a3153c535d CMakePM: Add default kit configuration hashing
This adds a QTC_KIT_DEFAULT_CONFIG_HASH variable containing the hash of
all the default Qt Creator CMake kit variables:
  * CMAKE_C_COMPILER
  * CMAKE_CXX_COMPILER
  * QT_QMAKE_EXECUTABLE
  * CMAKE_PREFIX_PATH

This way when a CMake preset changes any of these CMake variables a new
Kit will be created. Otherwise a previous kit containing different
values will be used.

Fixes: QTCREATORBUG-28609
Change-Id: I77b67e9c8fa15dc3ff2f22c5b63d4ca1c7670fdc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-06 18:01:32 +00:00
Jarek Kobus
b6208ab34a TaskTree: Introduce ParallelLimit
The parallel limit constrains the number of parallel tasks
run in the same time. So, if e.g. a group contains 10 children
and the parallel limit is 6, only first 6 tasks are being started
on the beginning and the rest 4 are being postponed until some
running tasks are finished. So, when the one of 6 running tasks
finishes the group starts the 7th task and so on.

Setting parallel limit to 1 means sequential invocation in fact.

The value of 0 means there is no limit and all tasks are run at once.

Remove the ExecuteMode enum, as this is modelled now by the
parallelLimit.

Change-Id: Ice59318be0915401f05bb5a5804078bdc591d09f
Reviewed-by: hjk <hjk@qt.io>
2023-01-06 15:28:19 +00:00
hjk
fbb8d94e55 Utils: Use hidden friends for FilePath comparison, hash and debug
Change-Id: Ic458d64cecdc811bac6b1cfaeae344f1da1b8211
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 12:54:59 +00:00
hjk
1874906ce1 Utils: Make CommandLine related operators hidden friends
Change-Id: Ifb81bb565f7343739883c06817f3e304bdc5b963
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 12:54:25 +00:00
hjk
bee489f9e2 LSP: Make hash and debug operator hidden friends
Change-Id: I91e7f8d7e9d21faa5d9bcd3f2d43fa61d22ab44c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-06 12:51:49 +00:00
Dmitry Bravikov
34ff9c97e6 Debugging: Add dumpers for libcpp types: variant, optional, tuple
Task-number: QTCREATORBUG-25865
Change-Id: I262ac708ae040982d2ed4f62e1f95807eaaae718
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-01-06 12:07:45 +00:00
Kai Köhne
b2fc935f33 Fix SPDX-License-Identifier to be on one line
To be able to be processed by tools, SPDX-License-Identifier expressions
cannot be split across lines.

See also E.4.4 in https://spdx.github.io/spdx-spec/v2.3-RC1/using-SPDX-short-identifiers-in-source-files/

Change-Id: I44d95cb2de44f53fdcaa745068e2df7e8e9767b3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:29 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
hjk
126d1d009e Utils: Remove two uses of FilePath::toString
The context here (passed as part of command lines args)  suggests
the use of .nativePath(), but if .toString() was ok so far, .path()
(i.e. with forward slashs also on Windows) would change less.

Change-Id: I045c4311c67b8875b87c328fbe57ca79ae0d7f1a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 10:37:00 +00:00
Jarek Kobus
33e8251edf Ios: Pass context object to lambda connections
Change-Id: I69a7a2ff3e91256961b2b501e75fe1a21d9c8b6f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-06 10:28:30 +00:00