Commit Graph

80529 Commits

Author SHA1 Message Date
Tim Jenssen
db4bbfdf4b Merge remote-tracking branch 'origin/9.0' into qds/dev
Change-Id: I4305c3b37814cc3a926e8e56cabe5f8935f8f2c0
2022-12-14 13:39:31 +00:00
Eike Ziller
a3fe24d192 Merge remote-tracking branch 'origin/9.0'
Change-Id: I5298a6529921568ec32c0fe0c009c273263b0f5d
2022-12-14 14:25:38 +01:00
Jarek Kobus
c5668952ae GitBaseDiffEditorController: Simplify internals
Remove initialize() method and do it inside reloader method.
When reloader is being executed the workingDirectory is already
set.

Amends bfcd1149eb

Change-Id: I600daaff8d15f3bdb822789623947b31df0b7edd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 12:54:09 +00:00
Jarek Kobus
cbcfc0242e FileListDiffController: Reuse task tree
This makes it possible that staged and unstaged
tasks are run in parallel, so the result is to be
expected earlier.

Change-Id: I0b99d17a55e39f2178d6ebed208e29fbaaa8aa5e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 12:53:47 +00:00
Jarek Kobus
1ee4b0e583 CorePlugin: Don't call mutable expressions inside QTC_ASSERT
In order to conform to the theory: "Removing all
QTC_ASSERTs and QTC_CHECKs should not change anything".

Change-Id: I95593962486e1de1b980f17b8f924d6f98fa8e80
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-14 12:36:12 +00:00
Jarek Kobus
72e19f0919 Android: Don't call mutable expressions inside QTC_ASSERT
In order to conform to the theory: "Removing all
QTC_ASSERTs and QTC_CHECKs should not change anything".

Change-Id: Ie8ef58533dfbeec00eaf45d42bcb731d8e2a3136
Reviewed-by: hjk <hjk@qt.io>
2022-12-14 11:58:40 +00:00
Jarek Kobus
bd170f3748 Ios: Don't call mutable expressions inside QTC_ASSERT
In order to conform to the theory: "Removing all
QTC_ASSERTs and QTC_CHECKs should not change anything".

Change-Id: Ieed804e44f4ca78a020444eb3f73d64d1bbdc916
Reviewed-by: hjk <hjk@qt.io>
2022-12-14 11:58:35 +00:00
Orgad Shaneh
038847709c Git: Suppress all output for instant blame
Change-Id: I5ad295cef22d0448f79d9187df85b582287b2835
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-12-14 11:54:05 +00:00
hjk
7971a83730 RemoteLinux: Give path line edits a bit more space
... in device settings.

Change-Id: I8c640b40a3505e97bdab955c14f22fe8017da3fa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 11:39:51 +00:00
hjk
7b08e79913 ClassView: Proliferate FilePath use
Change-Id: I4a8a18d6045557e31571970d671f3cc3f4374493
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-14 11:38:12 +00:00
Orgad Shaneh
2119dd4397 Git: Do not show progress bar and the command on instant blame
Change-Id: I22d06d0359d82d086062be4990b51858754b9145
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-12-14 11:04:18 +00:00
hjk
bf060b426f RemoteLinux: Use remote path choosers for gdbserver and qml paths
Change-Id: Ibf65b08bc1cb9d92a6e7561bd1e97a3e13ea5a7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-14 10:58:21 +00:00
Pranta Dastider
e46141dcd0 QmlDesigner: Update the tooltips for QDS view Components
Update the tooltip text for Qt Design Studio view
type of components.

Fixes: QDS-8310
Change-Id: I1b56e5bc26c6cc3711c304641cce3cbbd6d8c802
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-14 10:52:58 +00:00
Marcus Tillmanns
eca7044361 Utils: Add std::expected implementation
Adds a std::expected implementation that is compatible with >= C++11.

FilePath::fileContents and FilePath::writeFileContents as well as
FilePath::copyFile are changed to return std::expected.

A couple of macros have been added to aid in using the expected types.

An auto test was added showing how to use the library.

Change-Id: Ibe3aecfc1029a0cf13b45bf5184ff03a04a2393b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-14 10:39:29 +00:00
Jarek Kobus
13c7283c0e GitBaseDiffEditorController: Remove interactive branch expansion
Branches are now being automatically expanded.

Change-Id: I6c8986f39fe0ceb71841a2fea46b6038123240b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-14 10:22:00 +00:00
Jarek Kobus
85b645f144 ShowController: Make showing branches a part of show process
Change-Id: I23d994fd489fc6a6f02419452ad2b07c756a9cd3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-14 10:21:53 +00:00
Jarek Kobus
eef9cb458b DiffEditorController: Make it possible to setup task tree
Instead of reloader function. Use task tree for ShowController.
Make diff processing a part of task tree.

Change-Id: I732d0a14eaf8de7ce0d1be891fb4700b22ea24b7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-14 10:21:44 +00:00
hjk
041c59e90f QmlProjectManager: Support running on RemoteLinux
This adds a per-device qml run time path and enables X11 forwarding
via a run configuration aspect.

Task-number: QTCREATORBUG-28074
Change-Id: Iae5e724f44dba876d7a12443b3b89f85cd28f3df
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-14 10:01:54 +00:00
hjk
4159c4b5d5 CppEditor: More migration to FilePath
Change-Id: I261b713671e00bb567f61b4ee5ecf6fa83473bff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-14 09:14:12 +00:00
hjk
9bac0d7f4c Utils: Be a bit more informative in failing FilePath accesses
Change-Id: I2e30998d2d5cd3159b28996d1102c65cbb9ad03b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-14 08:34:51 +00:00
Eike Ziller
5cb1a29af2 German translation: Some cleanup
Make some things more consistent:

- Systemumgebung löschen -> bereinigen
- Mitglied -> Member
- gegenwärtig -> aktuell (or gerade)
- Alles auf/einklappen -> Alle auf/einklappen
- Tool-Tip -> Tooltip
- some spezifisch -> abhängig

- fix "_Run_ Without Deployment" to be a verb
- make translation for "No updates found" shorter, because it appears in the status bar

Change-Id: Ieb7b56f03883eb5c18d7de79e997b24a17c56001
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 08:32:57 +00:00
hjk
8e8afd3cf6 Utils: Remove FilePath::fromUrl()
Even though the concepts are similar, direct conversion is
usually neither desired (lossy) nor needed.

Change-Id: Id5c9e69d0597ed867cbda25f3fc4619a9fe90966
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 08:27:23 +00:00
Marcus Tillmanns
af881688e5 Debugger: Fix name of "mac_stdtypes.py" file
It was incorrectly assumed that the types were only used on macOS.

Change-Id: I8acc326fe63d4cb96b764da1262355d24494f337
Reviewed-by: hjk <hjk@qt.io>
2022-12-14 08:25:37 +00:00
hjk
89403daf4e Utils: Skip roundtrip through QUrl in FileCrumbLabel
Change-Id: I4796070ef2a3bb0b4d778c5b0db224574dbf4823
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 07:22:36 +00:00
hjk
dbaade3b47 ClearCase: Re-use FilePath::removeRecursively()
Change-Id: Iac0e8fcd774c366289b0f854e8b4c310dd109901
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-14 07:04:48 +00:00
David Schulz
e0b1f694e3 Editor: Fix deleting with numblock delete in multi text cursor
Fixes: QTCREATORBUG-28584
Change-Id: Ib65a933b61536d9a6342e82c51779c2a91983ec8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-14 06:20:05 +00:00
Christian Stenger
75177f4c34 SquishTests: Expect some more error message
Change-Id: I33f359673e6d23f0188072db891db08dafa72ace
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-12-14 05:06:25 +00:00
Pranta Dastider
bfffa32f1e QmlDesigner: Update the tooltips for QDS Component Components
Update the tooltip text for Qt Design Studio component
type of components.

Fixes: QDS-8313
Change-Id: I503e10a60f1d59f9a2e6b693c9f886254c3dabcd
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-13 16:36:18 +00:00
hjk
f9e373bba7 RemoteLinux: Add a per-device setting for qml runtimes
Task-number: QTCREATORBUG-28074
Change-Id: I8d1ea1908685212a8aba79ade39a2abf77e05409
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-13 16:36:05 +00:00
Jarek Kobus
354f67f11a AbstractProcessStep: Remove two virtual methods
Remove stdOutput() and stdError() virtual methods.
Connect to addOutput() signal in subclasses instead and
filter for desired channel.

Change-Id: Ifd9a2e4ff037776caa706bbdb9634992060172ff
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>
2022-12-13 16:23:49 +00:00
Jarek Kobus
9f53ba5795 AbstractProcessStep: Devirtualize processStartupFailed()
Since the base implementation of processStartupFailed()
is always calling finish(false), we intercept this inside
QMakeStep::finish override and set m_needToRunQMake accordingly
instead of overriding processStartupFailed.

Change-Id: I1d42d0034521dfad55e5a7e75a2ab234ca76c88d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-13 16:20:53 +00:00
hjk
d726615546 RemoteLinux: Move X11Forwarding aspect to ProjectExplorer
Pretty small and self-contained, and will avoid an explicit dependency
of the QmlProjectManagerPlugin on RemoteLinux.

Task-number: QTCREATORBUG-28074
Change-Id: Ia3c1bb6a887336040ac6e87c3d52570bbe2bc01f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-13 16:05:17 +00:00
hjk
337d48ca92 ProParser: Prefix mkspecs with remote roots
When needed.

Change-Id: Ibb159ce2513eb0d4023565dd11bc4c7dff5d0ec2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-13 16:02:39 +00:00
Orgad Shaneh
72751a9b98 Git: Remove outdated comment
Missed in eb1226df68.

Change-Id: Ib5d6d11bdb563882a2a651b3e26a30f006af973d
Reviewed-by: hjk <hjk@qt.io>
2022-12-13 15:53:42 +00:00
Miikka Heikkinen
857ee29c1a QmlDesigner: Add support for dragging textures to materials
Dragging textures to materials within material browser now works.

Fixes: QDS-8552
Change-Id: I1ec0287020fe2cd347bc0db7cda9d235678e9f04
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-13 15:13:42 +00:00
Miikka Heikkinen
db7d7eb801 QmlDesigner: Fix image data caching in previewImageDataForImageNode
Change-Id: Iaca7099e2e6bdf365bdb8dfeb26d92e12f7ddd90
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-13 15:09:20 +00:00
Cristián Maureira-Fredes
34ecdfc682 Add QtQuick.Window import for 5.15.x projects
Some of the templates were using the Window type
but didn't include the import statement for 5.15

Fixes: QDS-8468
Change-Id: I414d2bd09198374835de1ca6c81c8ed62d08dede
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-13 14:07:13 +00:00
Eike Ziller
938231cf0d More change log for 9.0.1
Change-Id: I2bf9cc9f0cb47b3bdda05a9905e563f70ff6d75e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v9.0.1
2022-12-13 13:20:19 +00:00
Pranta Dastider
ca023553b2 QmlDesigner: Update the tooltips for QDS Basic Components
Update the tooltip text for Qt Design Studio basic components.

Fixes: QDS-8309
Change-Id: Ic8bd30db189cbf405ae6ded56c8ed98225009d2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2022-12-13 13:20:19 +00:00
Mahmoud Badri
87d076d6a6 QmlDesigner: Fix possible build fail on some platforms
Change-Id: I5d412656cb61e7cc29af27a42922ad6c00bd4c6b
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-13 12:02:46 +00:00
hjk
5527573a86 CppEditor: Proliferate FilePath in cppsourceprocessertesthelper.*
Change-Id: I70e454e7cd487c8d678ddfd4dbbfac93cd261474
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-13 11:59:27 +00:00
Miikka Heikkinen
3d3bf4d923 QmlDesigner: Adjust for scene root transform when finding click pos
Fixes: QDS-8590
Change-Id: I0b8a604c4f78f57a64f4720ab676745c5d0db980
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-13 11:37:56 +00:00
Mahmoud Badri
521f220efb QmlDesigner: Add basic texture's info to tool tip
Fixes: QDS-8488
Change-Id: If4672863babef03bdc108109c514837a2587c6a8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-12-13 09:56:08 +00:00
Miikka Heikkinen
2a0a1181f9 QmlDesigner: Resolve active scene id also at model attach
When coming back to previously loaded document, the sceneId will be
available at model attach time and there will not be separate changed
notification for it.

Fixes: QDS-8585
Change-Id: Ic8fcd4e2ec9123adc39d0c1cdca3bdb86d3a7924
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-13 09:51:07 +00:00
Christian Kandeler
8d17762bb0 ClangCodeModel: Use newly implemented clangd support for operators
We now get a semantic token "operator" from clangd;
see https://reviews.llvm.org/D136594.
As a side effect, this results in the following subtle changes in what
exactly gets highlighted, both of which make sense:
    - The type part of a conversion operator is now highlighted as
      a type, not an operator.
    - We no longer add special highlighting for the brackets in
      operator new[] and operator delete[].

Change-Id: Ic149487496768762728a712c9fbcde5c9516529c
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>
2022-12-13 09:38:34 +00:00
Eike Ziller
c8aca8a3ab Beautifier/ClangFormat: Fix style check box states
Broke when inlining the .ui file. Because the two checkboxes no longer
have the same direct parent, "autoExclusive" does not work, and it needs
an explicit button group.

Amends 4933697d9a

Fixes: QTCREATORBUG-28525
Change-Id: Ia6af5f6083975faa5a65cdc9dd0bd2b671af147b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-13 08:47:43 +00:00
Ali Kianian
1839de431c QmlDesigner: Implement "Anchor to parent" for 2D-View Context Menu
ParentAnchorAction is added to handle "Anchor to parent" actions.

Task-number: QDS-8502
Change-Id: I629055fcf389c6c8dff3fc308180a9cdb57f26c9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-13 08:11:18 +00:00
Ali Kianian
fcf70d6957 QmlDesigner: Add checkable and checked properties to AbstractAction
AbstractAction could be checkable and it is also able to be checked.
The default action will follow isChecked overridden method when an
update is required.

Task-number: QDS-8502
Change-Id: Idf379ba544da57b138b43aa963174f43b750e34f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-13 08:10:54 +00:00
Ali Kianian
ef8802487e QmlDesigner: Implement new context menu structure
The 2D Context Menu is rearranged

Task-number: QDS-8388
Change-Id: Idca46da89a876f2a9a90acb9072be896d3e74468
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-13 08:10:35 +00:00
hjk
3e49961ae7 Welcome: Remove unused function openDroppedFiles
Change-Id: Ib6e65efaeb37560b2d0f9fe93bd7ad298d7b8e54
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-12-13 08:00:35 +00:00