Commit Graph

80529 Commits

Author SHA1 Message Date
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
Miikka Heikkinen
df622c9c3c QmlDesigner: Fix expand all and collapse all in content library
Fixes: QDS-8413
Change-Id: I98931c52f63bbbfd7a42e522a762d77b469df5da
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-12-09 13:27:25 +00:00
Jarek Kobus
1caade7333 VcsBase: Get rid of RunFlags::SilentOutput
In theory in was used only when we passed a non-null
editor together with CommandOutputBindMode::ToVcsWindow
into VcsBaseClientImpl::createCommand(). But there was no
such a case in the whole codebase.

Change-Id: I4b1162141e0849b49c12ee464e635debb62d5353
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-09 13:24:45 +00:00
Jarek Kobus
8d7ced7d83 VcsBase: Get rid of CommandOutputBindMode
Simplify createCommand() implementation. All callers
passed either non-null editor (in this case the
bindMode was always NoBind) or passed a null editor and one
of two values for bindMode (in this case the only
effect was to add (or not) a RunFlags::ShowStdOut flag).

Drop CommandOutputBindMode enum completely and pass
directly RunFlags::ShowStdOut when needed (i.e. in cases
we were passing CommandOutputBindMode::ToVcsWindow).

Change-Id: Ic3af05818933a03f615ba02267403b9f0bd326ba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-09 13:24:34 +00:00
The Qt Project
e65e5243f8 Merge "Merge remote-tracking branch 'origin/9.0' into qds/dev" into qds/dev 2022-12-09 13:07:47 +00:00
Jarek Kobus
834f89acf2 Remove unused variables
Change-Id: I653f6fa71bb04e049d4e1848a7e38a606692e678
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-12-09 13:01:53 +00:00
Amr Essam
944ba4a5be QmlDesigner: fix adding effect to 2D does not work on windows
Effect cannot be added in windows, during to latest changes in QDS-7344
The QFileSystemModel::dataChanged doesn't emit with some file types
So I used Utils::FileSystemWatcher for watching files changes

Task-number: QDS-8452
Change-Id: Id381a78556a3dad56268cec506a0182d4343f0a2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-12-09 12:41:04 +00:00
Jarek Kobus
4ff34cf47f TaskTree test: Use storage for getting the result from task tree
Remove storage() test case, as Storage functionality is fully
tested in processTree().

Change-Id: I05c199cf4cfa2a77493ce54df267b8ed1c2804bc
Reviewed-by: hjk <hjk@qt.io>
2022-12-09 12:09:23 +00:00
Jarek Kobus
7fc9933969 TaskTree: Add a possibility to setup storage handlers
Storage handlers make it possible to pass initial data
into task tree and make it possible to retrieve the output
data from task tree after the task tree finished.

Change-Id: I0bcc12f5e552f55c1d5d89b81521ae9cb7b8b124
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 11:47:52 +00:00
Jarek Kobus
dfdeb4d630 TaskTree: Ensure the same storage isn't added twice
Change-Id: I780d61091fea39a4542b4f743593b5062a784ba5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 11:45:26 +00:00
Jarek Kobus
8aa7ec1072 TaskTree: Add hash function for TreeStorageBase
Change-Id: Ia9242e3ca90ab13ee93fa42ebf86d03cc04fb669
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 11:44:22 +00:00
Jarek Kobus
cb8d4797b7 TaskTree: Add TreeStorageBase::operator==
Change-Id: I50144978b86f2e5fa89fc35c687b64ed102803e6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 11:42:49 +00:00
Jarek Kobus
162c8f71d3 GenericBuildSystem: Don't store unused expander
The default value of expander = project()->macroExpander()
was never used, as later it was always overwritten.

Change-Id: Iafaa491c4fb68aa6b9153a3647f6470a2aa293e8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 11:40:56 +00:00
Jarek Kobus
fc6b7996b8 Debugger: Pass context object to lambda connections
Remove some unneeded lambda () brackets.
Glue lambda brackets with parameters brackets.

Change-Id: I5df67cf01e497ad39c070a3f138a647762f2c33c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-12-09 11:36:09 +00:00
Jarek Kobus
448471a399 VcsBase: Ensure context not null inside vcsExecWithHandler()
When passed context is null use VcsBaseClientImpl as a context.

Amends 287a7c9268

Change-Id: I5817d74207683ae000fc2662920af2d1ff23d5ea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-09 11:28:29 +00:00
Jarek Kobus
2596f39823 VcsBase: Fix connection in revertAll()
The original intention was to connect to done signal
of the executed command.

Change-Id: I35e1f931a54bf763c3d9ffc71237b1d96cda1343
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-12-09 11:24:27 +00:00
Artem Sokolovskii
c0f3ef9a82 ClangFormat: Refactor for remote file system support
Change-Id: If44af32e2b3534fb350de9c657b99edd6bb6923a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-12-09 11:17:05 +00:00
Artem Sokolovskii
69abc39aea CodeStyle: Fix save settings without applying
Change-Id: Iebe4c4fb6f3279592e7933981aba69087db558f9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-12-09 11:17:00 +00:00
Marcus Tillmanns
26f07c62a0 Core: Remove unused Key
Change-Id: Ic3e9e7b994e010fe1b65b8273e74124dc957bdef
Reviewed-by: hjk <hjk@qt.io>
2022-12-09 11:15:39 +00:00