Commit Graph

80147 Commits

Author SHA1 Message Date
Jarek Kobus
6570895c0b TaskTree: Some cosmetic polishing after last refactoring
Get rid of unneeded local variable.
Use boolean OR instead of bitwise OR (regressed during refactoring).
Assert on parentContainer pointer inside task's done handler.

Amends 5dc4cd837f

Change-Id: I2517b80ae894317c52d46326681021d1133fbae9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-02 09:09:10 +00:00
Robert Loehning
1d6d01952b SquishTests: Fix tst_cmake_speedcrunch
Change-Id: I76b199a7e1f2e92b78b42ee08342a95bdf385950
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-02 08:35:17 +00:00
David Schulz
9c9e87d509 ProjectExplorer: Fix link generation for "note:" msvc compile output
We need to generate two sets of linkspecs in order to correctly mark
paths as links in the compile output _and_ the details text of the task
entry.

Change-Id: Ibb4ce89b8104f5edb1f1e45afa27cbd6c3ef5683
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-02 05:26:57 +00:00
David Schulz
6908130c83 Editor: Add replacement helper to document layout
More inline with the other text block user data members and cleaner on
the client side. Additionally add some & for const arguments and remove
test function call.

Change-Id: I19e646aa204eedf447c02a2f76b89c3430280169
Reviewed-by: hjk <hjk@qt.io>
2023-02-02 05:26:46 +00:00
Brook Cronin
01c8778fd0 QmlDesigner: Update fit all and selected icons
Change-Id: I40c973867c190d7b585a7e2fafac804d2b505add
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-01 17:40:49 +00:00
Marcus Tillmanns
7fbb41c10c RemoteLinux: Cache device environment
Change-Id: Ida735b69179b418c21d3875c3906b9449709623a
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 17:24:17 +00:00
Marcus Tillmanns
fb6fc2bde8 Utils: Add combine with device env option
Adds the option Environment::combineWithDeviceEnvironment. This allows
the linuxdevice to set it to false.

Without this option a deadlock would occur when the QtcProcess tries to
get the device environment and the device shell failed to start.
(e.g. because a required command is missing on the device).

Change-Id: I8f7550d0d90e989a339f27e993a836e67e910e33
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 17:24:07 +00:00
Thomas Hartmann
f603bfe7cc QmlDesigner: Change convertToEnum to use NodeMetaInfo
Task-number: QDS-8800
Change-Id: I6daef87ba87ce477edeb0c202a2d23af36474467
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-02-01 16:22:41 +00:00
Christian Kandeler
cf692bd2f6 CppEditor: Add soft assert against impossible token location
Change-Id: I1411c0f884c2f38b7e94b32714b8812210ea6d87
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 15:49:09 +00:00
Pranta Dastider
4d169f51c0 QmlDesigner: Update Tooltips for ItemDelegate Section
This patch update tooltip text for ItemDelegate fields
in Property editor.

Fixes: QDS-8926
Change-Id: I283c079a42d1c3c531ff5ec7641a715bbfd572b0
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-01 15:19:44 +00:00
Pranta Dastider
a6d4b5d7fa QmlDesigner: Update Tooltips for Button Control Section
This patch update tooltip text for Button Control fields
in Property editor.

Fixes: QDS-8923
Change-Id: Iac208f56ce3dea14a962abf3c6715de0104d1221
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 15:19:40 +00:00
Thomas Hartmann
ac673c2603 QmlDesigner: Fix states editor
Change-Id: I3b8bcfe81b673f9a9df895fe5616f3c7c5c2b5e0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-01 15:15:11 +00:00
Henning Gruendl
ef0056284a QmlDesigner: Add support for icon and border style
Change-Id: I9b5edb311a2911c56b42f0e264c942d432b530de
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 15:13:57 +00:00
Christian Kandeler
dfd8c8c98d QmlEditorWidgets: Fix wrong include
Change-Id: I7b5cc9150861fbff83e36b219563ec6f7ae0ec8c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-01 15:01:01 +00:00
Christian Stenger
476f67cce5 SquishTests: Fix default settings test
Depending on the presence of the llvm that had been used when building
QC we need to expect its clang.
Use special environment variable to be able to do this correctly.

Change-Id: I2497bbd96483f37aa90842d7fffa5d0a8103ff45
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2023-02-01 14:42:05 +00:00
Orgad Shaneh
8cb654a3ee Merge remote-tracking branch 'origin/10.0'
Change-Id: I3ecaaed281b491ad8bc86dd74d0e21b895ca80f3
2023-02-01 16:16:14 +02:00
Orgad Shaneh
092209fa84 CMake: Fix potential null deref
Reported by Coverity.

Looks like it cannot really happen in real life though.

Change-Id: I92e09dbe7dc81e694e5450c598c649c956eb7fcc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-02-01 13:54:43 +00:00
Orgad Shaneh
a0657f5d60 Debugger: Initialize members in WatchItem
Reported by Coverity.

Change-Id: I1af8a329b74f46af9cfab01749b57c031e4cd636
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:54:20 +00:00
Alessandro Portale
823b8c77a5 QmlEditorWidgets: Tr::tr
Change-Id: I507405fa6d162a72136e76727e27234d3b35172a
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:49:09 +00:00
Alessandro Portale
200a66644e QmlEditorWidgets: Inline contextpanewidgetrectangle.ui
Change-Id: I8f823c0035ef74671e8240cb50f447a521ec088e
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:49:00 +00:00
Alessandro Portale
4d6827dde9 Utils: Tr::tr
Change-Id: Ic03e20993f05fb5b49a12c891d86afb2c8e18e08
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:48:22 +00:00
Alessandro Portale
17b28909a9 QmlJS: Tr::Tr
Excluding the Qml parser, which needs to remain in sync with it's copy
in Qt.

Change-Id: I22f475f265dd74687e3239c4d6916c777798a447
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:48:12 +00:00
Alessandro Portale
fc8b81f2cb QmlEditorWidgets: Inline easingcontextpane.ui
Change-Id: Ib9960c56c3efdd4c4924999f80d97aa5cc3b6c69
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:47:53 +00:00
Alessandro Portale
5445ff511a QmlEditorWidgets: inline contextpanewidget[border]image.ui
Change-Id: I833e3b820dcc594f89825c3083b43542c9bec1bf
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:47:30 +00:00
Alessandro Portale
5733fe71f4 QmlEditorWidgets: inline contextpanetext.ui
Change-Id: I566a43a08763f9ccd0fd949f0fa594012d2fe942
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:47:24 +00:00
Christian Stenger
d8b5f32e5a QtSupport: Fix missing object name
Used in squish tests.

Change-Id: Ib0eadfd295a5f03449509d70d1e1dfd1601e616b
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:41:09 +00:00
Jarek Kobus
45d72db1b4 TaskTree: Add 2 more variants of NestedParallelError test
Variant 2:
Inside this test the process 2 should finish first, then synchonously:
- process 3 should exit setup with error
- process 1 should be stopped as a consequence of error inside the group
- processes 4 and 5 should be skipped

Variant 3:
This test ensures process 1 doesn't invoke its done handler,
being ready while sleeping in process 2 done handler.
Inside this test the process 2 should finish first, then synchonously:
- process 3 should exit setup with error
- process 1 should be stopped as a consequence of error inside the group
- process 4 should be skipped
- the first child group of root should finish with error
- process 5 should be started (because of root's continueOnError policy)

Change-Id: Ie34737244c7da4334a6cbbae4f0ddba99503d09c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-01 13:10:06 +00:00
Jarek Kobus
f8d4e485c2 TaskTree: Add a test for running empty tree with group handlers
Change-Id: Ia8c31928f07bec7a91937e0a1798d99ac761d0e2
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-02-01 13:10:00 +00:00
Jarek Kobus
5dc4cd837f TaskTree: Divide internal data into ConstData and RuntimeData
RuntimeData is of std::optional type, empty when not running.
Restructure internals.

Change-Id: I347bfce3f135b31853f2612103e7b3187dc956b2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-02-01 13:09:52 +00:00
Thomas Hartmann
310e703aa1 QmlDesigner: Use QDS 4.0 branch for components
Change-Id: Ia19b434c25623308f6581db68482c3bf5d92fd51
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 13:03:00 +00:00
Jarek Kobus
b177f925d1 Remove unneeded includes of QFutureWatcher/Interface
Change-Id: I1069b1dbd9fe1754afef0009d4f18cedeeecec1e
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
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-02-01 13:02:50 +00:00
Robert Löhning
54326a127e SquishTests: Use openDocument()'s return for verifying project tree
It's used anyway, relies on the expected project
tree and works around a problem on some machines.

Change-Id: Ic1e3e7a3f492f37d70c4409699ca78ad548d7445
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-01 12:41:47 +00:00
Thomas Hartmann
dffce44987 QmlDesigner: Fix crash
Using propertyMapFound->second.push_back(property) crashes
if propertyMap does not contain parentProperty.

Task-number: QDS-8992
Change-Id: I61b993abe978d7d8ceba1eade7139fd32479d885
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-01 12:30:34 +00:00
Christian Stenger
6a888242d3 Squish: Close opened squish files
..when switching sessions or closing test suites. There is
no need to keep them opened inside QC.

Change-Id: I5b4ddec64ca11a0d82b28d2946bebff9fa0a4bac
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-01 11:31:26 +00:00
Christian Stenger
1e41170123 Squish: Improve handling of license issues
When running a test case and having no license present we
do not get any result, so do not try to merge the result
files at all.
Additionally inform the user about the license issue
directly and avoid starting multiple test runners when
executing e.g. a complete suite and the runner had already
an license issue.

Change-Id: Idf6c07e95b81228775f7d6ef691c31efaf6ecdbc
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-01 11:31:18 +00:00
Christian Stenger
2b00256ebf Squish: Fix removing a test case
The action has been present but forgotten to get
implemented.

Change-Id: I7979f852e5b8f89a8014cc05748fb97d35be27e4
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-01 11:31:09 +00:00
Christian Stenger
f7c35a4a32 Squish: Remove action for removing a test suite
QC normally does not remove projects or similar and
removing a folder can be done by the user manually.

Change-Id: I6c4d21847d2caa7d39057bf5771e1e9779c822ca
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-01 11:31:01 +00:00
Thomas Hartmann
f3ef600979 QmlDesigner: Properly define toolbar height everywhere
Adjusting some icons and details.

Change-Id: Iedf79ebeac2dc73fccf48e85bd524461a2fd6807
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-01 11:26:48 +00:00
Thomas Hartmann
4597317d2d QmlDesigner: Fix crash
Task-number: QDS-9009
Change-Id: Id2c862e1890ecfc0f2d14bf58eb6cb4c5112d0ba
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 11:15:38 +00:00
Christian Kandeler
be9a01252d ClangCodeModel: Make use of new semantic token in clangd
... for angle brackets.
See https://reviews.llvm.org/D139926.

Change-Id: I17be843005e290a8aec91573d9ed4bd0727e2dab
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-01 11:06:54 +00:00
The Qt Project
df3e7e5bdd Merge "Merge remote-tracking branch 'origin/9.0' into 10.0" into 10.0 2023-02-01 10:52:37 +00:00
David Schulz
4e02fba933 TextEditor: add inline suggestions
Change-Id: I8c670a2aee17e461da1e3882d5b642da935b3d7a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-01 10:50:17 +00:00
Christian Kandeler
93201df992 ClangFormat: Pimpl ClangFormatConfigWidget
Task-number: QTBUG-110780
Change-Id: I4039db916276c84660775a2cdd4e4538df784329
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-01 10:24:36 +00:00
Thomas Hartmann
0198ed15f3 QmlDesigner: Skip makeComponentChain in TextToModelMerger::load
This is not required in the context of QmlDesigner and can become
very slow.

Change-Id: Id4a4ae30c5fa55e88ed295624365efb724e26f62
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-01 09:48:12 +00:00
Jarek Kobus
6758b5f69f Utils: Move QtcProcess::normalizeNewlines() into StringUtils
Change-Id: I515d2554497d5c27fd75e50c80ba373fbbe8dcb5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-02-01 08:56:34 +00:00
Jarek Kobus
825fea1fe9 TaskTree: Fix flakiness of DeeplyNestedParallelError test
It could happen that first process done was the one started
as 2nd one - in this case we should try to stop all the
processes potentially running, not only those starting
from index 1.

Simplify internal implementation.

Change-Id: I49049fba6bc4ef6a4544aaff5b582a976162edaf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-02-01 08:56:22 +00:00
Ali Kianian
4108ba874a QmlDesigner: Tweak context menu design
- Margins are changed for the context menu.
- There should be more space between action text and shortcuts in
  the context menu.

Task-number: QDS-8969
Change-Id: I345b3197bb702c5704a8d91d65dcb7d96f2697b4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-01 07:51:50 +00:00
hjk
1fbc707b3f Fossil: Convert to SPDX-style copyright headers
Change-Id: I14d5fe8f3b8be809276779be95475e620db01789
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-02-01 07:45:37 +00:00
David Schulz
0dab651ccd Merge remote-tracking branch 'origin/9.0' into 10.0
Change-Id: I7e171601cd7317b48d5074bbc0ead127813d596c
2023-02-01 08:16:30 +01:00
David Schulz
e39a79845a Merge remote-tracking branch 'origin/10.0' into HEAD
Change-Id: I55ff1d27695d6d7715538695e442bf097a1f3a1f
2023-02-01 06:54:49 +01:00