Commit Graph

8032 Commits

Author SHA1 Message Date
Marco Bubke
f25413a151 QmlDesigner: Fix duplicate in .clang-format
Change-Id: I88b1a126e30894167de0e3023a957eb22b5368fb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-10-09 09:46:48 +00:00
Christian Stenger
248ac4a658 SquishTests: Adapt to moved menu item
Change-Id: Ib8df3f315b3e82b5ac4cc81f1347db801de994ff
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:46:31 +00:00
Christian Stenger
c45ab95400 SquishTests: Fix finding line edit on wizard
Change-Id: I75059b7e302b1e54b8ac78357f631ca2fd15269a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-06 11:46:26 +00:00
The Qt Project
0a5f48a949 Merge "Merge remote-tracking branch 'origin/qds/dev' into 12.0" into 12.0 2023-10-05 13:57:02 +00:00
Tim Jenssen
85ea2758ac Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
	share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
	share/qtcreator/themes/dark.creatortheme
	share/qtcreator/themes/default.creatortheme
	share/qtcreator/themes/flat-dark.creatortheme
	share/qtcreator/themes/flat-light.creatortheme
	share/qtcreator/themes/flat.creatortheme
	src/libs/utils/CMakeLists.txt
	src/plugins/CMakeLists.txt
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
2023-10-05 15:53:42 +02:00
Christian Stenger
ea01be4a49 SquishTests: Fix debugger test
Assign a name for a label for easier retrieval and fix the used
objects inside the shared script.

Change-Id: I1769b87d776a2dc9fee9ca9eb26805f6a8475fc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-05 13:06:51 +00:00
Christian Stenger
52c47063b4 SquishTests: Adapt to changed wizard template
Change-Id: Iee09bbfdcd700d8a6a66c9ad7fec356d84dd2bd7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-10-05 13:06:34 +00:00
Christian Stenger
1d449ad7d6 SquishTests: Fix CSUP test
Function completions nowadays provide the special tooltip holding
the variations of argument lists if it is an overloaded function.
Check for it and if it is present just close it to avoid an endless
loop.
(When processing the file we use 'Cursor Down' to navigate through
the file but if the tooltip is open we just toggle between the
overloads and process the same line again and again)

Change-Id: I21742c5a460cf1537151e30c3135bebb83695703
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-05 09:14:38 +00:00
Marco Bubke
a4a8fd5b81 Utils: Extend transform for container insertion
You can now return a container and it will be appended to the result
container. That has the drawback of generating temporary container but
if we get them already it makes the code much more readable than a raw
loop.

Change-Id: Ibcd38e85ef759c18cd8da0fac0185f0f6fc123e2
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-10-04 11:47:26 +00:00
Marco Bubke
f12e484056 QmlDesigner: Remove typeName() usage from TextToModelMerger
Task-number: QDS-10266
Change-Id: I81a8ff71f1e3b118bf472b266d4038ab85d6d617
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-04 10:29:13 +00:00
Marco Bubke
975a282130 QmlDesigner: Ensure that indirect imports are deleted too
If we import an indirect import can be added too. So if we remove that
import we have to remove the related indirect imports too.

Change-Id: I4cb09fdc8986c473db2a8194766778956bc7069a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-04 10:28:56 +00:00
Marco Bubke
ebe1c889b7 QmlDesigner: Integrate component generation
It is only activated if the project storage is activated

Task-number: QDS-10578
Change-Id: Id93673eba470aa37a249072b3ef9e0231499095a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-10-04 10:28:35 +00:00
Christian Stenger
17d4099b89 SquishTests: Adapt to changed class
Change-Id: Id4ae34299ef80f22a466340511c2fa12dd6cf191
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-10-04 07:58:47 +00:00
Marco Bubke
1177bb4b1f QmlDesigner: Add PropertyComponentGenerator
Task-number: QDS-10578
Change-Id: I2c20f5aaa6ebfe7736012a02d4c4596589007866
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-10-02 20:22:10 +00:00
Marco Bubke
3a0eff9e79 QmlDesigner: Add mechanism to refresh meta infos
Change-Id: I894d26387afb32ccf1b8623976f7e6d9b19c0d80
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-10-02 20:19:22 +00:00
Marco Bubke
8c4f3d4970 QmlDesigner: Fix missing updatedProjectSourceIds
Otherwise we get constraint errors in the project storage later because
we try to insert a entry instead of updating it.

Change-Id: I25941a30c6d35e189153e49d5092e85ae0c7e683
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-10-02 17:11:32 +00:00
Christian Stenger
f01c4c4055 SquishTests: Adapt to changed wizard
Test projects have moved to their own category.

Change-Id: If69aecffd19f40a3d24be1b88970f9cc0045272a
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-29 12:20:25 +00:00
Christian Stenger
23828a1d9c SquishTests: Adapt to changed behavior
We nowadays use pragma once by default for include guards.
Enhance former check to be able to check for both later on.

Change-Id: I0955158f53e056fed2e3751cf42f51855ff95515
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-29 09:09:21 +00:00
Eike Ziller
91975f98af Merge remote-tracking branch 'origin/master' into 12.0
Change-Id: I0e2c7f8afb1c036814414160934f9ca1ac22bba7
2023-09-29 08:03:51 +02:00
Christian Stenger
32001b7e2a SquishTests: Adapt to changed ui
Change-Id: Ib1b13648b48e66e8932ee2c904cd783f8ccde727
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-28 12:47:15 +00:00
Christian Stenger
f2451f8cd3 SquishTests: Improve lldb expectations
LLDB provides a couple of executables that are not usable as
standalone debugger - explicitly filter them out.

Change-Id: I293479adb6b47b1a63e6cad5a9d1ab34e255d9ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-28 12:30:01 +00:00
Christian Stenger
51fbe96728 SquishTests: Fix accessing navigation tree view
Change-Id: I0f392c39c75c553cc65ade4c1689cf1085f1c5a1
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-28 12:29:51 +00:00
Christian Stenger
6bbebaac51 SquishTests: Fix accessing clear button on find tool bar
Change-Id: I9af1e6c2eb622254e9011942acb2004bf7b01970
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-28 12:29:39 +00:00
Eike Ziller
a0a4d9024e Merge remote-tracking branch 'origin/12.0'
Conflicts:
	src/plugins/python/pyside.cpp

Change-Id: I1f84ed56d38355cef6076797c72693fff4c1aa78
2023-09-28 11:02:38 +02:00
hjk
895f8e7396 Meson: Merge MesonProcess into project parser file pair
Only used there.

Also remove the translation line in the test project to help
with incomplete Qt 5 installations.

Change-Id: Id7029b499cec69a7e1733e2ac4ade9026c522951
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-09-28 07:00:21 +00:00
hjk
0eacd0190d All: Remove some unneeded #includes
Change-Id: If9a8fb5e0b32424e3b37ecf3adefc060f86b3630
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-09-27 13:50:38 +00:00
hjk
342e066886 Utils, all: Standardize on QtcSettings
Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-09-27 13:25:31 +00:00
Olivier De Cannière
eb5cdb4293 Revert: qmljs: add check for comparisons not depending on values
The warnings produced by these checks have always been somewhat broken.
Ever since they were added people users complained about the M325
warnings because they were confusing or because of false positives.

Fixes: QTCREATORBUG-29601
Change-Id: Ifac1ed0819a05251b3c4b583627cc45553e3d680
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-09-27 12:07:35 +00:00
Christian Stenger
dda6d05282 SquishTests: Adapt to changed ui
Change-Id: I906f4f9dc07f905b9efa71b1ada60409349a1b05
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-27 08:43:23 +00:00
Christian Stenger
cd5cbd64f7 SquishTests: Fix finding line edit on wizard
Change-Id: I26be629e11e2d768b3afed518cd6026028d2e17a
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-27 08:43:11 +00:00
Ali Kianian
db2682a5d2 QmlDesigner: Add google tests for the Lowest Common Ancestor Function
Change-Id: I7a0b0c2cfe8861d1d5387ebd7d79ba31ac2f1ed6
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-09-27 06:50:20 +00:00
Burak Hancerli
794cb89c2a QmlProject: Fix skipping some nodes with QDS prefix
This patch also contains the test data and updated test code for the
converters to test QDS prefixed version of .qmlproject file.

Task-number: QDS-10503
Change-Id: I496ba6f3d4d3cf90e75c2959c4196f4607677ea1
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-09-25 12:35:49 +00:00
Christian Kandeler
fca94a8366 qbs build: Fix manual tests
- Remove dependency on project.withAutotests by adding local
{Qt,Cpp}Application overrides that alias QtcManualTest. This way, the
respective products are a QtcManualTest when inside Qt Creator, while
also working outside the source tree.
- Rename QtcManualtest to QtcManualTest. (The reason QtcAutotest is not
camel-cased is because "autotest" is a single word.)
- Plus some minor clean-ups.

Change-Id: Idd77191f0b433d6d7443c639eebda383ab110082
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-20 10:22:21 +00:00
Eike Ziller
13c12f33e5 Merge remote-tracking branch 'origin/11.0'
Change-Id: I397dde2f95f62eb4843c39dd861522ae63d7f2c9
2023-09-20 10:43:54 +02:00
Christian Kandeler
a217fa0c22 qbs build: Clean up testing infrastructure
- Rename ambiguously named "testsEnabled" property to "withPluginTests"
  and fix the wrong uses.
- Move AutotestRunner out of main project file and into tests.qbs.
- Move "withAutotests" property into qtc module. We cannot remove it
  from the main project file just yet, because some manual tests do not
  make use of QtcManualTest at the moment.
- Do not remove the autotests from the project tree if autotests are
  disabled. Instead, just disable the products.

Change-Id: I74a4cc717d9adbe53d37536b2565111e1617115b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-19 13:16:28 +00:00
Marcus Tillmanns
768f12e033 Expected: Add upstream changes
Change-Id: I4fcf728200f50775c631c8a1399cd17643e3d519
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-19 12:47:50 +00:00
Christian Stenger
383cfb77cc SquishTests: Fix writing test files on Windows
Writing the text test files without encoding can end up in
ANSI encoding of the files and in turn a fail when opening
as the file is treated read only until correct encoding is
used.

Change-Id: I9e21e240b3b02011a2266dfda1f1b453c3dad457
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-19 08:59:23 +00:00
Marcus Tillmanns
f1907836fa Expected: Fix operator==(void, void)
Change-Id: I883f05155f0710fc3a9f92a2e33d4f8722159016
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-09-19 08:57:17 +00:00
Henning Gruendl
6d5ceadccf QmlDesigner: Improve type selection
* Disable custom item in Connection Editor type selection
* Rename Unknown to Custom

Change-Id: I9fa8c9ab6284503d5ccc61813454b9d10f291a06
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-09-15 11:33:49 +00:00
Tim Jenssen
da63a14481 Revert "Tests: Fix cmake build"
This reverts commit a263d3de89.

Reason for revert: QmlDesigner dependency was wrong

Change-Id: I2b67861ab81720649394045b68e2476bb51dd333
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-09-15 09:25:12 +00:00
Tim Jenssen
1a3a8ecc96 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: Id242ab4ca485527defdcc1555d204e12e50ddb7a
2023-09-14 17:37:24 +02:00
Christian Stenger
1701172c30 SquishTests: Fix opening cascaded menus
Change-Id: Ieae5d24f60b9e67c602dbf43737ee3a712a7908c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-09-14 13:27:30 +00:00
Tim Jenssen
a603b65f18 Merge remote-tracking branch 'origin/11.0' into qds/dev
Change-Id: I2bf1a2a72d9765d9b4088840414b4933644db47a
2023-09-14 12:23:01 +00:00
Eike Ziller
305a1a6ed1 CtfVisualizer: Fix computation of nesting level
The computed nesting level (which row an event to show in) was solely
based on begin+end events and "complete" events were ignored.

Compute the rows afterwards, similar to the "parent" computation that
the timeline model already does. Find the first row that is free,
and use that for the row of the item.

Change-Id: I890138c10f5038508da9b286b35d7bcfdf0ab64d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-09-12 14:28:15 +00:00
Thomas Hartmann
54b0c2d435 QmlDesigner: Add another test to ConnectionEditor
This covers field expressions with more then two members.

Change-Id: Idccfac607f72ff9aa78ed3b8da560f7d7a8e694d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
2023-09-11 11:04:28 +00:00
Eike Ziller
2792166574 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ifab8b72af33de4decf20d2a879bea4dfba1e9fbe
2023-09-07 11:15:32 +02:00
Marco Bubke
37c0737844 UnitTest: Fix or disable some flacky tests
If we get better tools we can come back and look again into it.

Change-Id: I8ded8f9831b0c46c09e15d283a6298ad09aaaeb6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-06 16:38:26 +00:00
Eike Ziller
7082d2a89b QmlJS: Delay loading of default QML type descriptions
We definitely do not need to do this during startup of Qt Creator, delay
to first use.

Change-Id: I5942b5346aedc3d6b677918ad28a6c2924d09493
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2023-09-06 10:52:36 +00:00
Marco Bubke
250b2cd7bd Sqlite: Introduce implicit transaction
Sqlite adds an implicit transaction if no transaction is used. That can
be problematic if you use multiple statements but it is okay for one
read statement.

Write and read write statements should use immediate transactions
because the acquire the write lock. Otherwise the write lock is only
acquired as you try to write. From there it is much harder to recover.

Change-Id: I04b0be7447f2b82b6921738d789c33cbbaa8de6e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-09-06 10:28:43 +00:00
Miikka Heikkinen
6251730f8f QmlDesigner: Refactor 3D view background and grid color implementation
The new implementation doesn't require these colors to be stored in
external dependencies anymore, as auxiliary properties are used for
them instead.

Fixes: QDS-10496
Change-Id: Ie71408617259d1af73a45f327d4bdfa4f2fa3a2b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-09-05 08:49:34 +00:00