Commit Graph

81085 Commits

Author SHA1 Message Date
hjk
1c2cf83c69 QmlDesigner: Inline assetexportdialog.ui
Change-Id: Ie22beaf507fcf146bcd3c5d228cafa33941425d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-06 12:35:27 +00:00
hjk
9b6ff3fb36 Vcs: Use PagedSettings for common settings
Also restrict the Reset VCS Cache button to the second
column, as it was earlier.

Change-Id: I291fdceb11df4ecdfdc0887fd521288d0b4544f3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 12:35:11 +00:00
Leena Miettinen
1348f0cfe0 Doc: Fix description of Add Class Member refactoring action
The developer must enter the data type of the member only if
automatic detection fails.

Change-Id: I51c1f36aeb34fb6560701cbd30a5748be5f1cde0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-06 12:06:49 +00:00
Robert Löhning
9cc9ec2aec SquishTests: Remove workaround for fixed bug
Task-number: QTCREATORBUG-28985
Change-Id: Ib69ccd0f967484a9858ddebdf08a376035e42e90
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 11:46:07 +00:00
Christian Stenger
a81c9b497a Tests: Fix qbs build
Change-Id: Ia4a54bab4208c5cdf1c7ce67f5caab84aa1583ef
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 11:45:04 +00:00
David Schulz
d617b046c6 Python: support remote file paths when loading projects
Change-Id: I94f709275d3b226685439ac55d58b029d3323d12
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 10:55:06 +00:00
David Schulz
beaf86f9de Python: filepathify python project path for saving
Change-Id: Ibcea9de6c8844cb826b61aa40357890153923854
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 10:42:13 +00:00
Alessandro Portale
b3e51d6242 ProjectExplorer: Fix build progress icon alignment
The build progress warnings/error icons were not vertically centered.
That was noticeable with the "Relaxed" toobar style.

Fixes: QTCREATORBUG-29252
Change-Id: I921ccc936c3233b2b2f80979aaae2b09709dbcff
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-06 09:32:12 +00:00
Christian Kandeler
0a1073f7cd ClangCodeModel: Restart clangd on changes in VCS repository
This should prevent the index from becoming stale after e.g. a git
checkout.

Change-Id: I94d364d3f2ec38889564c7859ca95ccb2de3019d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-06 09:18:12 +00:00
Jarek Kobus
d97d3f58ac TaskTree: Rename TaskItem into GroupItem
Not all classes derived from TaskItem are tasks,
but the common denominator is that all may be placed
inside a group: thus GroupItem sounds more appropriate.

Addresses the 10th point in the bugreport below.

Task-number: QTCREATORBUG-28741
Change-Id: I94d728a8e39ec732810f2e5bbe6b9a76f3bc387c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 09:06:01 +00:00
Christian Stenger
969f560c61 SilverSearcher: Fix missing include
Amends 64d209c24b.

Change-Id: Ib73302e98e4779e8d8f232852d45903a4055172a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-06 08:23:31 +00:00
Eike Ziller
8b85ac30a4 Do not show Design Studio settings page in Qt Creator
Change-Id: Iab2b8806f8041685440670fe741f25fb895afd99
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-06 08:14:18 +00:00
Alessandro Portale
6b04989fce Utils: Introduce customMargin(const QMargins &)
And re-use it for normalMargin() and noMargin()

Change-Id: Id779e2fa052ab35df3dd917d890ca7808dfb1a8c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-06 08:08:01 +00:00
Jarek Kobus
3f9704846b ImageScaling: Get rid of doc example markers
In order to more easily compare both implementations.

Change-Id: I4ff48cb4d4e61be4e2c8834f63091f4d825db0be
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 08:05:58 +00:00
Jarek Kobus
c3344c740a Tasking: Import imagescaling example
It's an initial copy of the
qtbase/examples/qtconcurrent/imagescaling.

The goal is to implement it using TaskTree and
compare both implementations.

Change-Id: I92953a70a3330ac679823060e75e5f39971ae444
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: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-06-06 08:05:39 +00:00
Jarek Kobus
9694d9c6f6 Tasking: Introduce NetworkQuery
The NetworkQuery class is prepared to work with TaskTree.
Provide the task tree adapter for the NetworkQuery class.
Register the task inside the Tasking namespace under
the NetworkQueryTask name.

This class introduces the dependency to Qt::Network,
otherwise Tasking namespace is independent on Qt::Network.
Possibly, may be added into Qt::Network lib,
as a wrapper around the QNetworkReply.

Change-Id: I29f160c0bf128c567ce20f044540b2dd6f1e17c4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-06 08:05:14 +00:00
Alessandro Portale
73791080d4 Core: Use LayoutBuilder in CommandMappingsPrivate
Change-Id: I327e3eae887c0e4e1dfe600685e71c194f26ff75
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 07:58:16 +00:00
hjk
f5d02f4bcb Utils: Fix compilation with recent Qt dev
After an update of Qt dev the following code in Creator fails to compile with

/data/dev/creator-out/src/libs/utils/aspects.cpp: In member function ‘void Utils::IntegersAspect::setValue(const QList<int>&)
/data/dev/creator-out/src/libs/utils/aspects.cpp:2323:35: error: no matching function for call to ‘transform(const QList<int>&, <unresolved overloaded function type>)’
 2323 |     BaseAspect::setValue(transform(value, &QVariant::fromValue<int>));

Work around by using a lambda.

Change-Id: Id5a844e7e5fe1846c4904dbad21472743439c4da
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-06-06 07:45:48 +00:00
hjk
cfa88ac169 QmlJS: Avoid deprecation warning
de18b3ff370543b5b99bd068b871a2cd677cf9f3 deprecated the
QCryptographicHash::addData(const char *data, qsizetype length)
overload.

Change-Id: I86444a9d7de3cafc596f508fc08c3a4c1f25142f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-06 07:45:27 +00:00
hjk
82966bc7ba Revert "ProjectExplorer: Remove 4.11 compatibility code in buildsteplist"
This reverts commit c8e1333f89.

Contrary to the comment in the code this is apparently still in active
use in the user file accessor.

Change-Id: I5e5dddbe2a95c70bda92ce732688041787145055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 07:14:41 +00:00
Marcus Tillmanns
7b3c2c13a1 Terminal: Decode percent encoding
Fixes: QTCREATORBUG-29254
Change-Id: I0d1712753f488dff9252d2fcf099c9aefb06ed0b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 06:43:36 +00:00
hjk
ebc185b1bb QmlProjectManager: Use FilePathAspect for device QML viewer overide
Cosmetical.

Change-Id: I480fd3163b45c3b2a19b7636cb79d6cb9b166825
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-06-06 06:43:04 +00:00
Jarek Kobus
b7bd30aeb8 Tasking: Introduce ConcurrentCall
It substitutes Utils::Async, but is Utils independent.

The ConcurrentCall class is prepared to work with TaskTree.
Provide the task tree adapter for the ConcurrentCall class.
Register the task inside the Tasking namespace under
the ConcurrentCallTask name.

This class introduces the dependency to Qt::Concurrent,
otherwise Tasking namespace is independent on Qt::Concurrent.
Possibly, may be added into Qt::Concurrent lib,
as a wrapper around the QtConcurrent::run() call.

Change-Id: I4511ff0430e78346aa6a4fae1a9d5370fdd08506
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-06 06:35:45 +00:00
Marcus Tillmanns
8d02d96127 Terminal: Fix esc button update
Change-Id: I4862de654ab920faa46742b4a4433dff07ed0387
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-06 04:37:59 +00:00
Jarek Kobus
b14c07eed6 TextEditor: Reuse qScopeGuard instead of ExecuteOnDestruction
Change-Id: I2ca7d4676bb4f34fbf59fd45bcd01d7857cb7e4e
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-05 08:35:14 +00:00
Jarek Kobus
e376355b18 CorePlugin: Reuse qScopeGuard instead of ExecuteOnDestruction
Change-Id: I2b6f6319d82512fec9a407649d7514f93283770d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
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>
2023-06-05 08:17:49 +00:00
Christian Stenger
8b3f246285 AutoTest: Tweak postponing parse once more
Postpone the parsing also if the build system is waiting
for a parse.

Change-Id: I56aaecfca05ea28a21c13747847b518d1eb8732f
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-05 08:02:11 +00:00
Christian Stenger
980a95f7d6 TextEditor: Fix missing include
Amends 8da3575d72.

Change-Id: I5696d83731cd25cc3abc58d7dc5359859918ac8e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-05 07:40:48 +00:00
Orgad Shaneh
e92a131644 Terminal: Fix MSVC warning
warning C4267: 'argument': conversion from 'size_t' to 'int', possible loss of data

Change-Id: I5d57843eba79f0eb023ea7e3c4149aa515430189
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-05 07:33:46 +00:00
Leena Miettinen
dc99f5ad6f Doc: Describe dragging and pinning the progress bar
Task-number: QTCREATORBUG-28996
Change-Id: Iba9eb4b1f53645763c637221b9f11c3ff54d2855
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-05 07:33:12 +00:00
Alessandro Portale
e759ce310f Core: Use LayoutBuilder in PluginDialog
Change-Id: I06b07234727fc46a717af89febae43af1cb67b9b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 12:46:40 +00:00
hjk
5bacd9328e Utils: Add a overload taking a AspecContainer for TextDisplay
Change-Id: If6cc933e852b80c4ec6abcc2477db8852392ca69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 11:58:54 +00:00
hjk
c8e1333f89 ProjectExplorer: Remove 4.11 compatibility code in buildsteplist
Change-Id: Id0e65f17dcd4697e3c4d1f828a564b495e114ee4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-02 11:58:42 +00:00
hjk
5986270232 QMakeProjectManager: Remove compatibility reading
For versions less then 4.12 (2019).

Change-Id: I566189eafe6deb1ed29b2e004a38cdd4295ea9b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-02 11:58:24 +00:00
Jarek Kobus
f10581ee31 GitGrep: Reuse searchInProcessOutput()
Change-Id: I5e97f23c0e2a06ccd3d204977ac1abc986b84e5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:51:29 +00:00
Jarek Kobus
64d209c24b SilverSearcher: Reuse searchInProcessOutput()
Change-Id: Ifc28a88c7bd0de94ea78c5f3eaaa2179b0aee600
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:51:08 +00:00
Jarek Kobus
8da3575d72 BaseFileFind: Introduce searchInProcessOutput()
To be used by SilverSearcher and GitGrep.

Change-Id: I16a5fa18a90e6c895658ebc9dd8fd209235e17d3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:50:29 +00:00
Jarek Kobus
7b2c1fdab0 GitGrep: Make pause and continue working
Make cancel and continue button working. Make pausing
above 200000 hits working.

Applied the same pattern as it was done recently inside
SilverSearcher: cd70d10dce.

Change-Id: I5e466e2176a59301dbfd3f957012e1760bd0c20f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-06-02 11:50:22 +00:00
Jarek Kobus
7a42c32732 SilverSearcher: Fix quitting the loop after resume
Quit the loop after resuming when the process already finished.

Amends cd70d10dce

Change-Id: I73d4b11bb2be47ce9cc6c6c816b60058bc2db250
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:50:11 +00:00
Orgad Shaneh
a5dfbe01d5 Utils: Support hardlink detection also on Windows
Change-Id: I717899ef73e965438ecd28983397ffc90a7ff570
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-06-02 11:25:54 +00:00
Eike Ziller
04c2a32fc0 ExamplesParser: Export only for tests
Makes binary compatible changes easier later, if needed

Change-Id: Ib3e04ac3a26068cf9f8bcc57b2dad9d0aeaaa5c3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-02 11:22:41 +00:00
Robert Löhning
a9720c1183 SquishTests: Don't generate tasks with empty description
Creator ignores them anyway.

Task-number: QTCREATORBUG-29209
Change-Id: I0ab2f96d55547ccf3112b18886518a065b19052a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:55:50 +00:00
Robert Löhning
de104fad12 SquishTests: Don't try changing build system of Quick Apps
They can use CMake only.

Change-Id: Ibbce50290597594a98ae08d9dd7ab171137c2b7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:42:49 +00:00
Christian Stenger
d9e3d32a80 MarkdownEditor: Ensure focus is inside the editor part
When loading a file it is more likely that the editable view
of the document should be focused than the read only part.

Change-Id: I8b7ed40a233dedf94883072be7462ebeabb78b42
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-02 10:42:02 +00:00
Robert Löhning
83c837049d SquishTests: Make number of results constant in verifyKitCheckboxes()
Before the change, we got zero results in the
expected case or up to two fails on error.

Change-Id: I6583844eb5473cad8190acc91db1207933dc6630
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:41:20 +00:00
Robert Löhning
37b30dc7a2 SquishTests: Remove workaround for fixed inconsistency
Task-number: QTCREATORBUG-29126
Change-Id: I2a84e606249d5ca7f68d7a73d819eee3f341216d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 10:40:59 +00:00
Christian Kandeler
d65273aee3 Update qbs submodule to HEAD of 2.1 branch
Change-Id: I3d670f8192f79806161fd7871fa9e5ff8c398f22
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 09:55:43 +00:00
David Schulz
68a5cd6575 LanguageClient: postpone creating progressbars
Some language servers are spawning progress reports for many small
tasks. This can get distracting in the case where those progress bars
are spawned while typing, like in the case of the python language server
that creates a report for every lint that gets triggered after receiving
a document change notification. So in order to reduce the amount of
progress bars created from progress reports we postpone the creation of
the bars.

Fixes: QTCREATORBUG-29224
Change-Id: I2e658be0a26b21e41c80b444184648ba70682522
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-02 09:03:02 +00:00
Yasser Grimes
f146bebbc7 McuSupport: Simplify template integration
To simplify how users integrate their projects with Qul, Qul related
template files are placed under the "qmlproject" subfolder.

Task-number: QTCREATORBUG-29114
Change-Id: I984f1619547951e0518790c843987f03b7daa62a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Sivert Krøvel <sivert.krovel@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 08:32:22 +00:00
David Schulz
270972c7bb ClangCodeModel: report highlight results in one batch again
... with Qt 6.6

Change-Id: Ic3ebb5cee4deeebf87a0d8e0ab33bcdc1c92c3a2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-02 05:37:50 +00:00