Commit Graph

68765 Commits

Author SHA1 Message Date
Jarek Kobus
78f2dda7ef TaskTree: Add docs for execution mode
Transform it form TaskTree's description into description
of sequential and parallel global variables, and into
docs for parallelLimit() global function.

Change-Id: I4aa2bac2f47778cde039cee77052359264224f93
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-30 09:37:38 +00:00
Orgad Shaneh
8c3d2d122f TaskWindow: Remove unused m_contextMenu
Amends commit 432de3a198 (from 2012!).

Change-Id: Iadb9474e46d0d2758dc5a6d9219c2bf04c2d66c5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-30 09:15:10 +00:00
hjk
a6848e2026 Docker: Register settings aspect more directly
Change-Id: Iaf36d476f53eab459cba4d0e64e55b73a395beea
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 09:12:16 +00:00
The Qt Project
6bf550e759 Merge "Merge remote-tracking branch 'origin/10.0' into 11.0" into 11.0 2023-05-30 09:08:27 +00:00
Marcus Tillmanns
afbdad999d Core: Add Command::actionForContext
Change-Id: I04ea463e1e9f4addafbea78c6302a488d7992ccd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:55:21 +00:00
Marcus Tillmanns
5943a42249 Core: Add OutputPane::setupContext overload
Change-Id: I15dc1cfa1981ea32925988c524b54cfd5ea1fcbd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 08:55:16 +00:00
hjk
e47c49b3f6 Conan: Register settingsaspect directly
Change-Id: I16f6b55b66a15670fc6382073700321d1db56adc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:55:04 +00:00
Marcus Tillmanns
9719bcfd2e Core: Fix filter when selected is not registered
Without this patch a warning will be triggered on Windows and
the selected filter is not chosen on all platforms when saving
a file, e.g. a json file.

Change-Id: Id6de0eddcac83369596f68d50494f10b70c30b15
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:54:58 +00:00
Eike Ziller
e71d7bf454 Merge remote-tracking branch 'origin/10.0' into 11.0
Change-Id: I110bc26f4469093d262a77c27623ad1dddd1b7c1
2023-05-30 10:52:47 +02:00
hjk
aa2e8e3cb8 VcPkg: Adapt settings page setup to recent aspect development
Change-Id: I16f4721723450e2f843f2eff0946e29733978eb0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 08:51:44 +00:00
Eike Ziller
bc52355f98 Tr: Move some html out of texts
Change-Id: I46c8d81630e18e244f16cefe696d662632340008
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-30 08:51:04 +00:00
Christian Kandeler
0c1974f9b8 CppEditor: Fix highlighting angle brackets
The code assumed that all highlighting results come in at once, which is
no longer true as of d6f5d07639.

Change-Id: I5ed6baf88956d64a30ee3fb236d4e2575a7f80c9
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:34:08 +00:00
Christian Kandeler
2cce367906 qbs build: Do not mark Axivion as a commercial plugin
This gets rid of the (optional) LicenseChecker dependency and the extra
git hash embedding.

Change-Id: I8f148a83bcf563859fa01e5993999c2ab8fd7cc4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 08:32:26 +00:00
Christian Kandeler
5fe9c0fb7c MCU: Fix wrong includes
Change-Id: I87e701d11a25c1d6efb4924716034518c15e4053
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-30 08:30:28 +00:00
Jarek Kobus
05b922ca94 TaskTree: Add documentation for group handlers
Document onGroupSetup, onGroupDone and onGroupError methods,
TaskItem::Group{Start,End}Handler and TaskAction enum.

Change-Id: I7516b867a2e3ce33b8f15a18f85d1e61d673d65e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-30 08:24:53 +00:00
Jarek Kobus
bd48121a88 TextEditor: Reuse searchInContents()
Change-Id: I08403d05830232becf7e5329339aaecf288894b7
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-30 08:22:32 +00:00
hjk
6286ae9853 Utils: Use the path from the current object
... in Environment::searchInPath().

Amends 6ab66690.

Change-Id: I04984c6a84c4448a6cd6d4d2677c84ed54376fee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-30 08:21:41 +00:00
hjk
369ade4c1c CPaster: Use PagedSettings for settings
Change-Id: I99ee3f548d98bc4f9e2fadcccd835d5d7f680934
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-30 08:20:32 +00:00
Leena Miettinen
c04a4a1ae0 Doc: Fix qdoc warnings
- Mark undocumented but existing functions with \c (instead of \l or \sa)
- Remove reference to functions I could no longer find
- Fix other broken links
- Fix reference to an image whose file format changed to WEBP
- Use {} instead of "" to mark alt text for images
- Add missing \a commands
- Add class name to a function name so that it can be found

Change-Id: I10655bb0356c7417ab0e14a3ce620930f4ee8349
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 08:13:53 +00:00
Leena Miettinen
4ecb016196 Doc: Add missing \a commands to MacroExpander docs
Change-Id: I153e4a4e7c687d6f524bbbff42c758282bb5deaf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 08:13:38 +00:00
hjk
326e20e8b9 Core: Use FilePath::searchInPath to look for explorer
Not expecting remote windows anytime soon, but moving towards
FilePath as main/only entrypoint to filesystem functionality.

Change-Id: I1701471394900049084fc7258fc56f7f912402ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-30 07:52:47 +00:00
Eike Ziller
4f1560666a Don't use uppercase ALT for shortcut strings
It works, but we otherwise consistently use "Alt"

Change-Id: I539a481aae1fb3d7da0a05d732122f3b81abfccb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-30 07:50:24 +00:00
Eike Ziller
14fe48dff7 Tr/Python: Simplify UI text for translation
Parametrize link target, and use markdown for simpler link syntax.

Change-Id: I6d1bae0431aa4e5bd7c7ad39b1219289eda40391
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-30 07:28:24 +00:00
Eike Ziller
ba21749832 Tr/Clang: Use markdown for easier translations
It was weird that the </a> was floating around without a corresponding
opening tag, and the markdown "[text](%1)" is simpler than
"<a %1>text</a>"

Change-Id: Ic0bdc155b1bfef07845a36935dd5fbbb70692b45
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-30 07:28:09 +00:00
hjk
d338e089fb ProjectExplorer: Remove build directory compatibility code
This was scheduled in bd05e01e3d
(Oct 8 2020) for removal in 4.16.

Change-Id: I1016c85fee9fe024636d619db27eabaf676bef8b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-30 06:01:04 +00:00
hjk
426a9a7037 Vcs: Register settings aspects more directly
Change-Id: I8049f71456b8e8573a2dcfce68a14fb12545865b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-30 06:00:35 +00:00
Andre Hartmann
419f5416c5 Git: Avoid main loop blocking in instant blame
Query the author and encoding information asynchronous
after the current repository is changed.

Set the default codec to UTF-8, which should cover most
configurations (i.e. almost never be different).

In case requesting the information takes longer, the blame
mark is already created with the cached information.

In case the author or encoding changed, the blame mark
has to be recreated.

The call to refreshWorkingDirectory() is moved after the
widget checks in setupInstantBlame() to avoid requesting
these information in VCS editors.

Fixes: QTCREATORBUG-29151
Change-Id: I6feccbbed67c877f1015295f630dd63cf3ccf4a0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-05-29 06:06:54 +00:00
Marco Bubke
15062522a3 QmlDesigner: Reduce the allocations by 50%
Change-Id: I4ff7046a57626eb19bf4e0bfef4cc0522015123a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-26 15:17:42 +00:00
Thomas Hartmann
551be63c81 QmlDesigner: Add environment variable to show QML errors
By default we silently fail, if there are QML errors in the property editor.
For testing this patch adds QMLDESIGNER_SHOW_QML_ERRORS,
which will trigger a message box for QML errors.

Task-number: QDS-9557
Change-Id: I81ffe142bd4b8695005f99a39c845ff0b96ab7d7
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-26 14:36:45 +00:00
Thomas Hartmann
ab1817c71a QmlDesigner: Cleanup crumblebar
Change-Id: Ib511f1ffb4827eda60ce4ac1a97103d74d4ce382
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-26 14:36:28 +00:00
Leena Miettinen
d15da2c0f9 Doc: Fix qdoc warnings in Core plugin docs
Change-Id: Id7b7c1c66e75ad5bce2ea9801493eb7872121e52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-26 14:32:07 +00:00
Thomas Hartmann
093a842650 QmlDesigner: Use internalId for comparison in ModeNode
This fixes a crash because code (crumblebar) relies on
the fact that two default constructed ModelNodes are the same.

Change-Id: Ie2df707642366454ffbc5d0b4d9363a93c8ba60c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-05-26 14:28:52 +00:00
Christian Kandeler
380dc1cbed ProjectExplorer: Fix warning about unnecessary std::move()
Apparently, the original warning about an allegedly missing move does
not appear anymore with current apple clang.

Change-Id: If3704b62e72765156fd3264267c98ea91b4d04c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-26 14:17:23 +00:00
Leena Miettinen
08b5f64c1a Doc: Mark destructors as \internal instead of \reimp in Aspects docs
Document BoolAspect::value().

Change-Id: Ia7f359e9302d371e3ea79fc3fce04e3c3c9a22a0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-26 13:58:10 +00:00
Christian Kandeler
fb59c70dcb CppEditor: Revert changes to parseExpressionStatement()
Amends c8f29b9e01.
It turns out that there are contexts where we want to parse an
expression statement even with the semicolon missing (e.g. completion on
incomplete code).
So leave the existing functions unchanged and do the thorough check
afterwards in parseIfStatement().

Change-Id: Id6209ef1abfe9d155c5b9381e6ae655cc721feb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 13:52:36 +00:00
Christian Kandeler
809f7c6cfd TaskFile: Prevent creating invalid tasks
Task-number: QTCREATORBUG-29209
Change-Id: I00c8152b598483c35ebb16c4ab5c58949c273065
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-26 13:52:07 +00:00
Eike Ziller
6e7bb28f09 Tr: Add missing full stops
Change-Id: I2debc56d0740eaa30c7d597eae18910f319c1d98
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 13:50:18 +00:00
Eike Ziller
f2c1455025 Tr: Wrap file paths with ""
Change-Id: Iee0e941ff503ff485e8e9c0d9fe3e52eea9042d5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 13:50:07 +00:00
Eike Ziller
b7f8143728 Tr: Various small fixes
Change-Id: Ic86d6b6a4aae7b301557eaa4296beb9a31399e03
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-26 13:30:36 +00:00
Marcus Tillmanns
bdb31d4348 Copilot: Allow user to disable Copilot
Fixes: QTCREATORBUG-29179
Change-Id: I274de1f13f773fb61b376643b61056b6f14dabaf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 12:55:57 +00:00
David Schulz
f385324bc8 TextEditor: fix highlighting after removing line
We cannot reconstruct the correct initial state for highlighting when
deleting a line if we generally save the after highlight state to the
next line.

Change-Id: I7d5f727f6b7c8340ac7f5436046cd0f1ad17ebd2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 12:15:43 +00:00
Jarek Kobus
97bb416452 PerfProfiler: Get rid of duplicated PerfSettings::changed() signal
This signal is already defined is base AspectContainer class.

Change-Id: I195f4758a8baa746ee7f214cbdb12e494c4824ef
Reviewed-by: hjk <hjk@qt.io>
2023-05-26 11:14:20 +00:00
Marco Bubke
26bc29e5b0 QmlDesigner: Use std::shared_ptr for internal property
We use it already for internal node. This removes the workaround for the
self pointer.

Change-Id: I81af888bd6f50fab0a2d03ca7e2556545a0c656e
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-26 10:53:29 +00:00
Jarek Kobus
a7ab1ba987 TaskTree: Doc corrections
Make docs more consistent.
Add some more precision when something is not clear.
Do some adaptations for behavioral changes.

Change-Id: I95c76fedf2c9d611702097842452186ea4cdf8b0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-05-26 09:34:27 +00:00
hjk
b0b80c539b CppCheck: Register settingsaspect more directly
Change-Id: I325c7329618b4dbdd36bb1464627806e5f116bc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 09:19:25 +00:00
hjk
60da3a024a Perfprofiler: Register settings aspects more directly
Change-Id: I19be173e4244add2d37eaab933293a6f30236c96
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 09:14:57 +00:00
hjk
a69489cd1e CMakeProjectManager: Register settings aspects more directly
Change-Id: I7bfbe3ad625b0902561975968221e90ce6af06d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 09:14:48 +00:00
hjk
4e60203132 Beautifier: Register aspects more directly
Change-Id: I406f34901a6488aa843bd2045286c008aff29e3e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 09:11:37 +00:00
hjk
b47df2a304 Copilot: Register settings aspects more directly
Also simplify a search.

Change-Id: I2ba511ca3250c624fb7dbc2b44f845a5757e72ce
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-05-26 09:00:48 +00:00
hjk
0e60643430 AutoTest: Register more aspects directly
Change-Id: I4dbf9cebb12fecc765aeac8e082061c29496f81a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-26 08:59:24 +00:00