Commit Graph

80529 Commits

Author SHA1 Message Date
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
David Schulz
739d4942e2 Merge remote-tracking branch 'origin/master' into 10.0
Change-Id: I9f6090e2a9f62fd3a9823f5a7342ea423dfbb2ac
2023-02-01 05:24:33 +00:00
Orgad Shaneh
4bfdfc2fbc ProjectExplorer: Fix potential division by zero
Reported by Coverity.

Change-Id: Ie11625afc862bd7918d5b9bffd73e6726adaac0f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-31 18:05:35 +00:00
Ali Kianian
5368330534 QmlDesigner: Make context menu grouping a single action
- Grouping actions has been merged into one checkable item.
- range and view namespaces are available for Utils.

Task-number: QDS-8662
Change-Id: I17b2190caf425d0d8271dd68af494dbc2b332f09
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 15:37:42 +00:00
Leena Miettinen
c5ea756027 Doc: Integrate Fossil docs to the manual
Now that the plugin has been moved to the qtcreator repository.

Change-Id: Iacf6c58765a10f5ad574688dc7ad917f6a705a14
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-01-31 15:33:03 +00:00
Marco Bubke
7bccb8d714 QmlDesigner: Deactivate only the project storage
Fixes: QDS-8951
Change-Id: I96ee9a97ee425b053aa1ba549536a9429e16dd8c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 15:27:35 +00:00
Marco Bubke
2fdec88196 QmlDesigner: Add default image for ItemLibraryIconImageProvider
Task-number: QDS-8918
Change-Id: I938f86b12ba2d60670b96312dd7f82d82ef32042
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 15:27:28 +00:00
hjk
6c8afcde88 Core: Make access to remote terminal easier in code
By re-routing through device hooks. Now basically a FilePath
is sufficient as a handle.

Change-Id: I0ee43c35096ada12114d50476d5156a6c1de1e70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-31 14:45:38 +00:00
Miikka Heikkinen
c14ec1b4c1 QmlDesigner: Don't create material library node in in-file component
While there are some valid use cases for having a material library
inside in-file component, having duplicate material library nodes
in a single file causes some issues that are not trivial to solve,
so for now we just prevent this from happening.

Fixes: QDS-8656
Change-Id: I4495ea4d972eab76ca444d18ab4c45b403805ad7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-31 14:40:49 +00:00
Thomas Hartmann
770463877c QmlDesigner: Fix designer theme
Change-Id: I2585acd1105390287eac1b0a0729c08321cce298
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 14:36:32 +00:00
Orgad Shaneh
128b21c959 Fossil: Import from super repo
git-subtree-dir: src
git-subtree-mainline: e20bdfae4d
git-subtree-split: c8b9e4504e

Change-Id: Id0c0ed8c57739cba2b0a7431f40f8c07fcab493d
2023-01-31 16:26:09 +02:00
Thomas Hartmann
080c8af850 Add DStoolbarBackground
Change-Id: Ied42d086af2aba2ce54b2ad9ed411feea7817416
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-31 14:05:20 +00:00
Yasser Grimes
862f484af5 McuSupport: Extend CMake targets tree for QtMCUs QmlProject projects
CMake project relies on the CMake's file-api to fill the Project View,

QtMCUs 2.4 will be using a different method to read input files (Qml,
Fonts, Images, Headers...) using qmlprojectexporter process, that
process is still called from CMake thus a CMakeProject is still used in
QtMCUs kits, but unlike previous versions add_sources is not called on
QtMCUs target making the list of input files read by the file-api empty
and as a result an empty Project Tree.

This commit extend uses the SessionManager to listen to when the the
projects are loaded and then use input.json file to populate QtMCUs
projects trees for projects using qmlprojectexporter the same tool
generating input.json .

Task-number: QTCREATORBUG-28516
Change-Id: I30a9daf1032e727692b8d71d01ab65634d0ae2a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-01-31 13:25:07 +00:00
Tasuku Suzuki
3d79244dd5 SessionNameInputDialog: change default button to "... and Open"
When one create/rename/clone a sesion, they will likely use the session.

Change-Id: I41d4e3c24833009a42385146fd2bb5a719465eba
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-31 13:19:07 +00:00
Tasuku Suzuki
53696ee71e SessionNameInputDialog: disable accept buttons when name is empty
Change-Id: I2a12d7b6e130adaed5bf724a27828feca72f0512
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-31 13:18:41 +00:00
Christian Stenger
e20bdfae4d ClangFormat: Adapt to changes in LLVM 16
Change-Id: Ia4a2cf21e351095609d8858f1f9355c6607470f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-31 13:17:58 +00:00
Thomas Hartmann
724eb54387 Add QDSTheme to theming and use it in ManhattanStyle
Change-Id: If3f634cd96665150b27605eaf7a2a5d4ea7078b6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-31 12:41:07 +00:00
Miikka Heikkinen
0078b47c8d QmlDesigner: Update SpatialAudio module component library icons
Also updated metainfo version 6.4->6.0, since adding SpatialAudio
module adds it as version 6.0.

Fixes: QDS-8854
Change-Id: I524ad371849c3bed3e3ce96400638348882c5110
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-31 11:09:35 +00:00
Thomas Hartmann
7fb5526752 QmlDesigner: Use latest icons for toolbar
Change-Id: Ia52c0bc4e9d74bf72cc0b368a5ec295bf53b5d73
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-31 10:58:50 +00:00