Commit Graph

80529 Commits

Author SHA1 Message Date
Brook Cronin
e0eb8d4fa9 QmlDesigner: Apply style to states view
Change-Id: I78d1d2fc6f2be2813b0e1f25b73a9ee1e80f5c16
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-02-03 12:14:32 +00:00
Henning Gruendl
9677d39c7b QmlDesigner: Fix style for Menu and MenuItem
Change-Id: Ib362de4d928001402cbff75303d498794e6c7ed0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-03 12:12:09 +00:00
Brook Cronin
b122030925 QmlDesigner: New themes and control styles
Change-Id: I8783d8cda6a8c0b954a58d2f65c54cdc7dfa6166
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-03 12:11:18 +00:00
Jarek Kobus
0d0ce383be RemoteLinux: Reuse StringUtils::joinStrings()
Change-Id: I5be99df99a4b3952374b9f3b719d032d897b691c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-03 12:03:59 +00:00
Jarek Kobus
5d96c3a4e9 ProjectExplorer: Reuse StringUtils::joinStrings()
Do some minor cleanup.

Change-Id: I375cec2cd4e0def201c09f5ad9eea4226a5d64e6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-03 11:59:29 +00:00
Christian Stenger
383c2205d0 QtSupport: Fix output formatter test
Broke with 8655603c2e.

Change-Id: I87a366065e5764ecd62d2a2799f408af4341f20b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-02-03 11:54:20 +00:00
Jarek Kobus
2d8d27c9ba StringUtils: Add joinStrings method
See QTBUG-110900. In meantime, StringUtils addition.

Change-Id: I700321a65d2d00b85daa412c77b573457312ad3c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-02-03 11:33:27 +00:00
Christian Stenger
f48b8b7bcb AutoTest: Avoid potential crash
Invalidating the filter model may crash while updating
the source model as it emits a layoutChanged().
Just invalidating the filter works as the sorting of items
is not touched.
Workaround this by explicitly using invalidateFilter()
instead of invalidate().

Task-number: QTBUG-103952
Change-Id: I52abda3936e870bb448c420e98a122edecffda7e
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-03 11:25:40 +00:00
Brook Cronin
e068a01fa6 QmlDesigner: Add new icons, fix broken icon
Change-Id: I1ab1213493deb0070e4545e86fd19fe455f46b0c
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-03 11:21:39 +00:00
Miikka Heikkinen
92f3d4adf5 QmlDesigner: Make AudioEngine and AmbientSound non-containers
These type don't support child nodes.

Fixes: QDS-9026
Change-Id: Ic4afd1631db400d8a0efa95480f4a23467fdabf4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-02-03 11:08:08 +00:00
Christian Kandeler
d7308cc7a6 ClangCodeModel: Ignore built-in types
... in the semantic highlighter. The syntax highlighter already handles
these.

Change-Id: Ib1e80ec194021dbd2b4eca7a300db869ccddb7b0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-03 10:59:41 +00:00
Artem Sokolovskii
020320ab78 Android: Add extension to the package name in SdkManager
- Add "Extension 4" if the name contain "-ext4"
- Fix issue with two Tiramisu packages, now one of them
conatin "Extension 4" in the end.

Change-Id: Ib84807e9401acdef53c3dc1195dc3dc6ef34a57d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-03 10:42:45 +00:00
Henning Gruendl
fb7ab99c5e QmlDesigner: Fix crash on macOS TopLevelComboBox
Change-Id: I0a33143a646ef2b8c251fa4c9737dbd979d6461f
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-03 10:37:02 +00:00
Samuel Ghinet
5142632c22 QmlDesigner: Ensure Effects folder is visible after recreate
Moved the Effect Maker functionality from assetslibrary model to the
widget, so as to have access to the `directoryCreated()` which is used
on the QML side to (forcibly) update the rows. This should fix it, even
though I could not reproduce the problem for effects myself -- adding
ordinary assets, though, always emits `directoryCreated()` to avoid
this kind of problem.

Task-number: QDS-8916
Change-Id: Ib72c4a235851eed266b6751bb67d4de6acbcfcc5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-03 09:58:22 +00:00
Samuel Ghinet
9147c7abe2 QmlDesigner: Fix renaming a folder in Assets View expands the wrong folder
The previous implementation was saving the _row_ of the TreeView before
performing the rename, and after the rename it was expanding that _row_.
However, when renaming a folder causes it to be moved up or down between
the rows, the saved _row_ number becomes invalid.

The better way is just to use the same mechanism that is being used when
creating a new folder: add the new folder path to a list, and later on
expand rows based on that list.

Task-number: QDS-8896
Change-Id: I6a6bb2faaa7d03ea2af384e5f2b635000577a94c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-03 09:57:35 +00:00
Miikka Heikkinen
15d92cf1e5 Use imagecache for all AssetImageProvider images
TextureImageCacheCollector is added to the existing async image cache
to generate thumbnails for image files.

Fixes: QDS-8581
Change-Id: I4a334b3241688d7a61a0560463bff32763a216a5
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-03 09:42:34 +00:00
Christian Kandeler
7c6a00b4e7 ClangCodeModel: Ignore number literals
... in the semantic highlighter. The syntax highlighter already handles
these.

Change-Id: I26f6bca06c4fc648ffe59bd9e3639d81d2265755
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-03 09:33:55 +00:00
Jarek Kobus
4f70aa7052 TestRunner: Reuse TaskTree
Get rid of QFutureInterface argument from
ITestConfiguration::createOutputReader() and from
TestOutputReader c'tor.

The fine-grained progress reporting was broken anyway:

1. The assumption was that testCaseCount was meant to be
   the total number of test functions executed. It didn't
   include the initTestCase() and cleanupTestCase(),
   while those were reported on runtime apparently
   (and exceeding the max progress by 2).
2. In case of tst_qtcprocess, when the whole test was run,
   the testCaseCount reported 41, while the real
   number of functions was 26 (+2 = 28 for init/cleanup).
3. While the max progress was set to testCaseCount initially,
   the corresponding FutureProgress rendered the progress
   always in 0-100 range, what didn't match the reality.

Instead, rely on TaskTree progress, which resolution
is per test as a whole. So, when executing a series
of tests this should scale fine. In addition, the
progress advances fluently according to the expected
run time - with 10 seconds hardcoded.

The original code locations, where progress was bumped,
are left with a TODO comment for any possible future tweaks.
Like in case of result reporting, fine-grained progress
reporting may be implemented by providing additional signal,
so there is no need for QFutureInterface inside
TestOutputReader.

Change-Id: Idc11d55e3a49dac8d1788948b9a82f68199203c6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-03 08:15:58 +00:00
Christian Stenger
8655603c2e Utils: Improve readability on output windows
Enhancing the StyleHelper by some functionality used
on the results pane of the AutoTest plugin and make use of it
inside the output formatter.
This highly improves readability depending on the current theme
when having output formatters and allows to easily re-use the
output formatter there instead of having several stuff
re-implemented.
Mainly relevant for output formatted with ANSI escape codes.

Change-Id: Ic2f5eff877656eb52e3bd2fda0ec9a015e54ea82
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-03 06:34:53 +00:00
Henning Gruendl
88e75709d4 QmlDesigner: Fix TopLevelComboBox popup close
Task-number: QDS-8957
Change-Id: I0d4b5d976777c6dc3c15b8eed40bda51198dca7f
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-02-02 18:35:43 +00:00
Cristian Adam
2eb9338be0 CMakePM: fix presets sort assert with MSVC in debug mode
Amends 9deef74d9e

Change-Id: Id4e7fcbfa6bdc8ac65afc2c93510e8389d7e7fe4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-02 16:50:21 +00:00
Sivert Krøvel
d8b2673ad1 McuSupport: Update qmlproject wizard to stable API
Updating the New project-wizard for qmlproject based projects to use
the stable API as released in Qt for MCUs 2.4.

Task-number: QTCREATORBUG-27721
Change-Id: Ie97d6478135022c1733927c98a3c7f729dc0bb52
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-02 16:15:31 +00:00
Cristian Adam
51cbfd77db CMakePM: Improve CMake presets kit config hashing
Amends a3153c535d

QT_QMAKE_EXECUTABLE was not taken into consideration and this would
result in not matching kits.

Also Visual Studio generator will not have a CMAKE_C|XX_COMPILER values
in the cache.

On Windows there could be paths with "C:" vs "c:" and the hashes again
wouldn't match.

Change-Id: I5da5fafbd29f3d1fd8c9615c41b7659e63c30ff1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-02-02 15:56:46 +00:00
Pranta Dastider
cd7a5904bc QmlDesigner: Update Tooltips for BorderImage Section
This patch update tooltip text for Border Image fields
in Property editor.

Fixes: QDS-8929
Change-Id: Ie49549244cf8ea0d7ee52ffe2446b3e25a129e4e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:33:29 +00:00
Pranta Dastider
16c7dd6466 QmlDesigner: Update Tooltips for Icon Section
This patch update tooltip text for Icon fields
in Property editor.

Fixes: QDS-8924
Change-Id: Ic9bd8b025f9218e1492c9ad54c5beaaf350d4596
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:32:41 +00:00
Pranta Dastider
611e0fc8d1 QmlDesigner: Update Tooltips for Button Section
This patch update tooltip text for Button fields
in Property editor.

Fixes: QDS-8927
Change-Id: I11920a2f9680cf0901b9111623f2af3c52eb0b26
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:32:11 +00:00
Pranta Dastider
bea410e987 QmlDesigner: Update Tooltips for AnimatedImage Section
This patch update tooltip text for AnimatedImage fields
in Property editor.

Fixes: QDS-8928
Change-Id: I430d5efe72696c36504364ce3f5bbdff31ebbc54
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:31:09 +00:00
Miikka Heikkinen
d3afdf3aba QmlDesigner: Prevent lock and eyeball for material library items
Fixes: QDS-8883
Change-Id: I00839e5c446842ab76ab7e68a54509e131da7471
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 15:12:15 +00:00
Christian Kandeler
c31522731c ClangCodeModel: Ignore boolean and pointer literals
... when doing semantic highlighting. The syntax highlighter already
handles these.

Change-Id: I048e033eda5b72d2e6eafaaccdb66040a00afe6a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-02 13:36:16 +00:00
Christian Stenger
f952918390 CppEditor: Add missing include and ifdefs
Change-Id: I34b1d0f4fb10c7fcba6e6b7bc1b3d964e154db3a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-02-02 11:16:32 +00:00
Christian Kandeler
209e3d0e66 CppEditor: Fully handle raw string literals in the syntax highlighter
As of a3af941adf, the built-in highlighter
can properly handle multi-line raw string literals, so we don't need to
abuse the semantic highlighter for this anymore.

Fixes: QTCREATORBUG-26693
Fixes: QTCREATORBUG-28284
Change-Id: If644767dfa8a97294e84a541eea44143e8d1bb88
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-02-02 09:52:55 +00:00
Pranta Dastider
8fc956df48 QmlDesigner: Update Tooltips for Flickable Section
This patch update tooltip text for Flickable fields
in Property editor.

Fixes: QDS-8930
Change-Id: I7a2d4372c3ea9e07db33b344d5db634e050a7837
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-02 09:44:22 +00:00
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