Commit Graph

80147 Commits

Author SHA1 Message Date
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
hjk
a2a6073b0c Docker: Use FilePath::from/toVariant to store clangdExecutable
Change-Id: I7e728ab15e9839893f53c068633e9763d6e13d49
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-12-13 07:32:42 +00:00
Marcus Tillmanns
e7a2448681 TextEditor: Cache tabSettings
Change-Id: Ib44198b4763eac865ea46831e7a02924bf533475
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-12-13 07:32:21 +00:00
hjk
4d80daf71a Utils: Use QStringView in FilePath::setFromString
Change-Id: I830f4b3a7a12bfb4ddcbef443b53a37bb24bc992
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-12-13 06:35:48 +00:00
Mikhail Khachayants
81075b813c TextEditor: Fix wrong tooltip when split mode is used
It was possible to get a tooltip with cached text from other editor area

Fixes: QTCREATORBUG-28571
Change-Id: I4250856e6c165eed70ddb4a6c888e16b4a6b045d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-12-12 19:46:59 +00:00
Vikas Pachdha
430998d769 Update interface to let refreshing files in code model
The use case is to wait for the udpate to finish

Task-number: QDS-8469
Change-Id: Ia3871a5557c90a06b33eee52840b267d808cfe21
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-12-12 16:27:08 +00:00
Jarek Kobus
763c76b477 ClangToolsProjectSettingsWidget: Don't overload slots
Make slot names unique in order to avoid QOverload.

Change-Id: Icb43f6087de85c637f4b33ff48588dc4e56b9db3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-12 16:07:14 +00:00
Eike Ziller
92ab0c7f13 CMake: Fix startup warning
Accessing MimeDatabase for text/x-cmake before plugins are initialized

There is not much use for using QMimeType internally anyway, since they
are effectively only used as strings.

Amends ac2ca7244a

Change-Id: I4d7b1bb2f0ad4e857409e3ef287f5b9abe052193
Reviewed-by: Xavier BESSON <developer@xavi-b.fr>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-12 15:26:29 +00:00
Jarek Kobus
168ff2c68c CppTypeHierarchy: Fix showing type hierarchy
Don't repeat the main symbol as its child inside
derived hierarchy. The regression was introduced
when addDerivedHierarchy() was added.

Amends e2155a91df

Change-Id: I34cd19be4307d355ea84fbdb64a06d0d3505e8a9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-12 15:20:04 +00:00
Artem Sokolovskii
8addb599a9 ProjectExplorer: Fix Add button alignment on Compilers tab
Fixes: QTCREATORBUG-28367
Change-Id: I468729fc2fd46f7f55081a696ff9d8913f5823d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-12 13:15:21 +00:00
Miikka Heikkinen
56e242c9f9 QmlDesigner: Disable 'add to selected model' option when it's not valid
MaterialBrowserTexturesModel's hasSingleModelSelection property value
is now updated at context menu open, as that's the only place using it.
This is similar to how hasSceneEnv is handled.

Fixes: QDS-8582
Change-Id: I63871a5557c90a06633eee52840b267d808bfe27
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-12 13:12:23 +00:00
hjk
bc7eed8c62 Boot2Qt: Fix parameter passing for make-default step
Change-Id: I1c1eae97f6f2a01f60727d1a74b3220a23fec6b4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-12 10:52:33 +00:00
Jarek Kobus
218b19fe14 SshProcessInterface: Limit waiting for kill to finish
This is just a workaround for 9.0 and not a proper fix!

It looks like sometimes kill command may freeze. Don't blocking
wait for it for 30 seconds - limit this time to 2 seconds.

Do the same inside SimpleTargetRunner. Pretend the process
finished after 2 seconds, otherwise the SimpleTargetRunner
object gets leaked and we start receiving asserts from
ProcessLauncher about destructing it when still some processes
are being run.

Task-number: QTCREATORBUG-28072
Change-Id: I9766e7ff6f0c2abf2010686027702d30d32c4318
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-12-12 10:36:08 +00:00
Cristian Adam
1e122fa3a3 CMakePM: Have case insensitive locator filters for cm and cmo
There is no reason for preserving case. We filter out a predefined list.

Change-Id: I4aa6c70210e4ecdf896c7ecc48f01d475a0afed6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-12-12 10:28:57 +00:00
Eike Ziller
af60fb8241 Merge remote-tracking branch 'origin/9.0'
Conflicts:
	src/plugins/cppeditor/cppelementevaluator.cpp
	src/plugins/vcsbase/vcsbaseclient.cpp

Change-Id: I31e03b063240416280f5ca88c31f432911d5c67e
2022-12-12 11:07:15 +01:00
Jarek Kobus
172066ed56 FindToolWindow: Rename setCurrentFilter() overload
Rename it to setCurrentFilterIndex(). In this way it's unique
and may be used inside connections without QOverload.

Change-Id: Icdb27081d65b785842a847db64edfe433257b1bb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-12 09:28:13 +00:00
Jarek Kobus
e5e31e5732 MesonProjectManager: Rename addMesonTool() overload
Rename it to addMesonToolHelper(). In this way addMesonTool
is unique and may be used inside connections without QOverload.

Change-Id: I3f109b5da3115e8275c05e9daec07192bef32ef7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-12-12 09:02:47 +00:00
Jarek Kobus
4fc5483c74 FontSettings: Remove unneeded QOverload
Change-Id: Ie6a7fe10a0f8975277c007d50ace8ab233167d32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-12-12 08:39:35 +00:00
hjk
36c025ba2d Utils: Change Aspect readOnly default to false
Change-Id: Ib1f593b55f9e187e57ac7f57173c5b16fdce4b63
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-12-12 08:07:03 +00:00
Christian Stenger
20d81d3e61 CMakePM: Fix qbs build
Amends ac2ca7244a.

Change-Id: I81ac9fda00e8fd3d468cc9ea27e32f6a0280cf8b
Reviewed-by: Xavier BESSON <developer@xavi-b.fr>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-12-12 07:39:32 +00:00
Jarek Kobus
131ecdd3ec TextEditor: Pass context object to lambda connections
Remove some unneeded lambda () brackets.
Glue lambda brackets with parameters brackets.

Change-Id: I66da839573a1633104f689834740bc2953f5868f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-12 06:54:59 +00:00
Jarek Kobus
12f66d18ff Fossil: Adapt to upstream changes
Follow up 32e824c762

Change-Id: I2d8c9f1b9424bfc2db2abbc25ed272c093a6ed63
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-11 14:55:07 +00:00
Jarek Kobus
1cdf29a1e6 DiffEditorController: Make setReloader() protected
Change-Id: I2c988794176aa2e234c15ae88c425f30c1726810
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-11 14:31:51 +00:00
Jarek Kobus
32e824c762 VcsBase: Don't return editor from annotate()
Take int firstLine as last arg instead. Switch the order of
3rd and 4th args as most callers provide lineNumber
and don't provide revision.

Change-Id: Iab60c1068a4d9829d10219af39bf3dcbf51e37bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-11 11:15:15 +00:00
Jarek Kobus
db85862a8c Git: Reuse handleResponse() inside vcsExecAbortable()
Remove ConflictHandler::attachToCommand().
Rename handleResponse() into handleConflictResponse() and
move it out of ConflictHandler class.

Change-Id: I0a64bd19f288d9377a93cdb5eea2c44b65bf6fdb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-10 18:40:30 +00:00
Jarek Kobus
305dc46902 Git: Add CommandHandler into vcsExecAbortable
Don't return VcsCommand anymore.

Change-Id: I895951e8bd8d380d7b946380628e41b928c9b743
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-10 18:15:49 +00:00
Thomas Hartmann
c2f8677e9f QmlDesigner: Move actions from toolbar to context menu
Change-Id: Ia8513f21ecd82d238e94bf9e59d54685c52c0d46
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-12-09 17:58:26 +00:00
Xavier BESSON
ac2ca7244a Beautifier for CMake files
Fixes: QTCREATORBUG-25773
Change-Id: I30df110512553b28894427e4d473814400153923
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-12-09 15:23:31 +00:00
Miikka Heikkinen
6c1545bcb3 QmlDesigner: Apply gamma correction on generated icons of HDR images
Fixes: QDS-8438
Change-Id: Ibd1c1951c8c5e7f1c050b145167f17c8fefadeaa
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-09 14:28:51 +00:00
Marcus Tillmanns
bcfaf00d00 ProjectExplorer: Add clangdExecutable to IDevice
Change-Id: I131212326696887d3a5644a35788f6a522dbee45
Reviewed-by: hjk <hjk@qt.io>
2022-12-09 14:00:19 +00:00
Marcus Tillmanns
d3487b1bde Utils: Fix FilePath::searchInPath remotely
Change-Id: I49bd7fd96427b55d28743eab277c72710a2ac6c0
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 14:00:09 +00:00
Marcus Tillmanns
067d02f82d Utils: Only existing path to FSEngine::deviceRoots
Change-Id: I7b5068efdbf83490d729ebe3165729ad9f92d790
Reviewed-by: hjk <hjk@qt.io>
2022-12-09 14:00:02 +00:00
Marcus Tillmanns
d01c22b805 ProjectExplorer: Show near paths as relative
Previously if a path was not a child of the directory it was inserted
into it would be displayed as an absolute path.

This changes it to show it relative with ".." as long as there are no
more than 5 "../"'s.

Fixes: QTCREATORBUG-288
Change-Id: I456138e97298d58ac6d95e69443c8e187fb8782c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 13:59:54 +00:00