Commit Graph

68765 Commits

Author SHA1 Message Date
Aleksei German
96cd0b3668 QmlDesigner: Fix for mainFiles missing filepath
It always returns projectDirectory otherwise

Task-number: QDS-9984
Change-Id: Ia8a7d660eef46ec4e0afd53c1452798f95367dcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-26 09:47:52 +00:00
Alessandro Portale
42a62a3a5d Android: Obtain values for AndroidRunnerWorker from settings data
The members of AndroidRunnerWorker are supposed to be initialized with
aspect values from the AndroidRunConfiguration. But they were instead
unsuccessfully obtained from the RunControl's aspects.

This obtains the values from the RunControl's settings, instead.

Fixes: QTCREATORBUG-29160
Change-Id: I124184c32d158e0648a0ee1d23dfe8707d18eab8
Reviewed-by: hjk <hjk@qt.io>
2023-06-26 07:34:57 +00:00
Mahmoud Badri
977facbbda QmlDesigner: Update content library models when visibility change
...instead of resetting the model. This prevents downloading materials
and textures from getting interrupted and is more efficient
performance-wise.

Fixes: QDS-9654
Change-Id: Id15a86c43ba06aa07071229259b9ea163979b619
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 07:23:39 +00:00
Eike Ziller
6836caa14c Do not compile PROJECT_USER_FILE_EXTENSION into plugins
Set it in the app info in the main application and read it from there.
Moves more branding information out of the plugins.

Change-Id: I2f2e9fc96900793be15ac1907df70dda31c1b9c1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-26 06:58:36 +00:00
Eike Ziller
dff9e1463b Reduce usage of app_version header
Most information is available via Q(Core|Gui)Application.
Add an AppInfo structure for the things that are not.

This avoids that the information ends up duplicated and
hardcoded in the plugins, which is not needed or desired.

Change-Id: I4d565e75c42a7b8facafa90c27096ea49359215d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-26 06:57:46 +00:00
Jarek Kobus
fdf3feaf0b TaskTree: Readd networkquery.h into the SOURCES section
In this way the networkquery.h is still reachable from
the project explorer.

Change-Id: I49646a077a5a6fe72bf81234c6111cdf0f371699
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 06:22:25 +00:00
Jarek Kobus
27302694ab BaseFileFind: Reuse FileContainer
Reuse it in BaseFileFind::files() and in
InternalEngine::executeSearch().

Change-Id: I2fed4e6af37e83d76deaa8d847564aa4950fc223
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 13:04:05 +00:00
Jarek Kobus
8c9683a627 FileSearch: Introduce oveload for findInFiles() taking FileContainer
Handle gracefully pausing the search after exceeding the 200000 hits
limit and continuing on user request.

Change-Id: I4e9ea92cfdb5fa54706c862a654edb6169fce84a
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-23 12:38:26 +00:00
David Schulz
4da2d288d8 Editor: avoid relayouting of annotation text for each paint event
Change-Id: Icabf033a43922bb9ebafd1a7973dcac851e9369e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-23 12:30:09 +00:00
hjk
a62fcb73ce ProjectExplorer: Remove IDevice::createProcessListModel
All re-implementations are the same nowadays.

Change-Id: I954b3c9ca296967a99ea548ade6282fba188249f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-23 12:27:03 +00:00
hjk
d045d8dc60 ProjectExplorer: Merge DeviceProcessList into ProcessList
The abstraction was not used anymore.

Change-Id: I756ae65b9164d0032c3e6a26c3a123fc50f72a75
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-23 12:21:39 +00:00
David Schulz
fd04d6afa4 ProjectExplorer: always map working directory path to command device
Change-Id: I0d2d54df118b70c2874b77b4ec2792fb8e114416
Reviewed-by: hjk <hjk@qt.io>
2023-06-23 12:06:36 +00:00
hjk
4a17a26a6d Python: Allow redirecting the display for remote setups
Change-Id: I83baa9c74a1586590147668c9fea661018101776
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-23 12:06:22 +00:00
Marcus Tillmanns
31c6ff495a Debugger: Fix remote debugging macosx apps
Change-Id: I5328069ba9b82bb66dfa2c1e0d148a717d594a4b
Reviewed-by: hjk <hjk@qt.io>
2023-06-23 11:57:34 +00:00
hjk
26ef870761 Debugger: Somewhat more direct server command construction
No need to set args just to delete them again.

Change-Id: Ib97d327329a25cb907227feb22db2334908ef089
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-23 11:50:13 +00:00
Marcus Tillmanns
ffa52040a4 Docker: Fix ensureReachable
ensureReachable for a path on the same device must return true.

Change-Id: I5b6924795997758ec0ad31520fa971ecd2a9615c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-06-23 10:40:42 +00:00
Knud Dollereder
68d7aee492 Use the viewport center as pivot when zooming into the curve editor
Fixes: QDS-10128
Fixes: QDS-10129
Change-Id: I7959a7b83b04cbc95b0d541fd1de7b45b387e752
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-23 10:21:18 +00:00
hjk
b0d0a5bca3 Meson: De-noise
Change-Id: I7ef49cbb29fc5429972abc24e9db5dbca506da0d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-23 10:20:04 +00:00
Christian Kandeler
b42bdc0e4f Update qbs submodule to HEAD of 2.1 branch
Change-Id: I66789d70fb1379eadc614ed629fadde69ae729c9
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-23 09:59:26 +00:00
Christian Kandeler
98b341b7cc CppEditor: Do not assume an opening brace starts a block
... when generating doxygen comments.
Otherwise, we will not properly parse declarations such as
    void f(int i = {});
or
    int m_member{};

Fixes: QTCREATORBUG-29198
Change-Id: I744041d2cd5438e4b64161bba04a088a8910024b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-23 09:54:07 +00:00
Christian Kandeler
cf6bd7e012 Fix occurrences of the contains/insert anti-pattern
Introduce and make use of Utils::insert() for QSet with a return value
that indicates whether insertion actually happened.

Change-Id: I655e4bc3553b74fea5ae8956205e4d8070118d63
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 09:51:54 +00:00
Jarek Kobus
c510689fe4 ClangToolRunner: Move finishAllAndDone one level up
When the onSetup() handler returns StopWithError,
the group stops immediately with an error, regardless of
its workflow policy.

Our intention is to report an error only if the initial
onSetup() handler returned StopWithError. Otherwise,
regardless on how the subgroup execution went, we want to
report success to the parent. That's why the
finishAllAndDone is an appropriate policy for the top group.

In case the ProcessTask fails, we don't want to continue
executing AsyncTask, that's why the finishAllAndDone got
removed from the subgroup, leaving it with the default
workflow policy of stopOnError.

Change-Id: I86ac18f062cd431e5138f87cdb01ef59e3d77d7e
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-23 08:58:40 +00:00
Christian Kandeler
1532986f10 ClangTools: Do not require a valid clazy executable to run clang-tidy
... and vice versa.

Change-Id: I85114c778f97e04299d4b66a3ad99abdb503185f
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-23 08:48:04 +00:00
hjk
ae33199d04 Debugger: Use CommandLine to set up debugger server
To allow more complex actions in the command line,
like parsing $SSH_CLIENT.

Change-Id: Ifc48a74f1fe4e42cd7ceddfd3c308bd1636212a7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-23 08:20:01 +00:00
Marcus Tillmanns
ee2fa69def RemoteLinux: Generalize deploy step
Instead of three different deploy steps we use only the RSyncDeployStep
which can be configured to each of the three file transfer methods.

The SupportsRSync constant is moved to projectexplorer so that it can be
used by all devices.

The RSyncDeployStep checks which transfer method is available based on
source and target devices. An option is added for the user to force
a different method in case of issues.

Change-Id: I2b1eb39b5bd4a30d0f879d18317b7677d127f48f
Reviewed-by: hjk <hjk@qt.io>
2023-06-23 07:57:23 +00:00
hjk
bf46b4d557 QmlProjectManager: Compile fix after Qt source compatibility break
error: operands to '?:' have different types 'QStringBuilder<const QString&, QString>' and 'QStringBuilder<QString, QString>'

Caused by af8f9a2a6e3dbc8.

Change-Id: Ib3dfca2cb5f1cb1855f25d178f63898eb6745c46
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 07:46:24 +00:00
hjk
35e9b13e15 App: Fix a warning
"QGuiApplication::setDesktopFileName: the specified desktop file name
ends with .desktop. For compatibility reasons, the .desktop suffix will
be removed. Please specify a desktop file name without .desktop suffix"

Change-Id: I84fa4d6dbed9ab95f9f90b452915bdce290743f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-23 07:40:59 +00:00
Christian Stenger
ffffb18f8f Copilot: Fix compile
Change-Id: If9e2c6486e2ac9b80069947063e80336567fbdbe
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit eb7d0727e6)
2023-06-23 07:37:37 +00:00
hjk
c9521b294f Copilot: Disable by default also in the settings
... and make the enabling more prominent.

Change-Id: I77e236a1aec2d3ced3280aa8af322a02b8a14dd1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 07:12:33 +00:00
hjk
4625d9e87e Copilot: Add a warning in the settings page
... about copilot operation.

Change-Id: I9187f1759f183f4df393e057dc0cdb3307665afc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 07:12:21 +00:00
Christian Stenger
39a2145e43 Debugger: Fix compile
Amends 0cf1477324.

Change-Id: I6f34277eb888ef29e8bf53e88bb670d1969f6cd2
Reviewed-by: hjk <hjk@qt.io>
2023-06-23 06:51:54 +00:00
hjk
428f62a7fe Meson: Inline NativeFileGenerator into its only user
Also, filepathify and simplify surrounding code a bit.

Change-Id: I963bbc95a81d753918b6734870630b539378f03e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-23 06:26:52 +00:00
Christian Stenger
0f2fbe4f6f McuSupport: Fix qbs build
Change-Id: Icd881dfaabcf8d4ed8bd63d4c6653348234ac77c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-23 06:12:06 +00:00
David Schulz
9452c433a2 ClangTools: fix warning text mark color
Change-Id: I37e45990a3bcb23b16ccdeee5886c5d80f55cc43
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-23 05:45:49 +00:00
David Schulz
e2f957b184 ClangTools: lower priority of warning marks
In order to not overwrite errors reported by clangd lower the priority
of clang tool marks if they only contain a warning.

Change-Id: Ida1c39ab11aaeb0c70f674c53762fa2707bec766
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-23 04:52:23 +00:00
Christian Stenger
eb7d0727e6 Copilot: Fix compile
Change-Id: If9e2c6486e2ac9b80069947063e80336567fbdbe
Reviewed-by: hjk <hjk@qt.io>
2023-06-23 04:29:45 +00:00
hjk
e419dbbb78 Meson: Emit parsing finished when done
Also, trigger build button re-check the hard way

This should not really be necessary, but the code paths on the
core side are still quite twisted. The extra notification here
is harmless in price, and removes the showstopper of not getting
a buildbutton.

Change-Id: If4bec892b4ebea533a95033629df60fa564985f3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-22 16:38:03 +00:00
Alessandro Portale
c9c029ebd4 QmlDesigner: Inline timelinesettingsdialog.ui
Change-Id: Ib590944e3dcf8f1069bdeeb08b206a9ca9de5ce1
Reviewed-by: hjk <hjk@qt.io>
2023-06-22 15:35:05 +00:00
Alessandro Portale
22d5807799 QmlDesigner: Inline timelineanimationform.ui
Change-Id: I0f41837cf51c09ca753aae0c68bdc9775f66beeb
Reviewed-by: hjk <hjk@qt.io>
2023-06-22 15:35:01 +00:00
Alessandro Portale
ae83cc375b QmlDesigner: Inline timelineform.ui
Change-Id: I81e26b62fb289ca95d04b9f8a755de7251c52f6a
Reviewed-by: hjk <hjk@qt.io>
2023-06-22 15:34:56 +00:00
Knud Dollereder
4d51605866 Make locked curves brighter
Locked curves had roughly the same color as the background color
of the curveeditor. They are now a little bit brighter in order
to see them better.

Fixes: QDS-10130
Change-Id: Ic9cfc8358d9e1f2d4df132b27cb286653a0c35e8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-22 15:31:00 +00:00
hjk
0cf1477324 Debugger: Split out gdb related options into own page object
Goal is to make option setup more similar to the other "simple" pages.
The GdbOptionPage is now separated in the setup code, but aggregated
into the old place and accessed there.

The per-backend separation seem quite weak, a full split would currently
need to have include gdb/* in several places now is an indication
that the gdb/non-gdb split in the options is dubious at best.

Change-Id: Iad210016739aa4a63645731e16825f546bdd5e8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-22 15:22:38 +00:00
hjk
091b853068 Utils/Core: Make an aspect container layoutable
Most aspect containers end in a widget at some time. Let them declare
how.

The optionspages don't need a layouter anymore when using their
settings' one. There was only one case where there was none, fix
that one (perforce).

Change-Id: Ibd39bcd4af98c3eae1daafa59f6c1d6e7a571989
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-22 15:22:01 +00:00
The Qt Project
88f1779167 Merge "Merge remote-tracking branch 'origin/11.0' into qds/dev" into qds/dev 2023-06-22 14:51:12 +00:00
Tim Jenssen
846f8dba92 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
  tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp

Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
2023-06-22 14:50:56 +00:00
Knud Dollereder
802d1227ea Set a minimum section size in curve editors treeview
This fixes a bug on some systems where resizeSection did not work
as expected making the sections for the icons too wide and therefore
the item names unreadable for the default treeview width.

Fixes: QDS-10131
Change-Id: I10242a7f3f96c580b3256f7ca420466173581e35
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-22 13:44:45 +00:00
Artem Sokolovskii
03aeee71f4 DAP: Add showing locals and stack trace
Change-Id: I5298b4c2daf45ec4503d4a210e02b7025253c054
Reviewed-by: hjk <hjk@qt.io>
2023-06-22 13:31:57 +00:00
Christian Kandeler
c3fd118c62 ProjectExplorer: Bring back auto-detection of ccache toolchains
... and other special toolchains not in PATH.
Amends cacc4aeede.

Change-Id: I300f7d719c9e101c24e3750dd7afd54dd338b58d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-22 12:37:43 +00:00
Marcus Tillmanns
f29b54d8a1 Autotest: Use FilePath::searchInDirectories
FilePath::searchInDirectories handles absolute paths on devices
better unlike Environment::searchInPath() which requires
a QString argument.

Previously the device:// part was dropped when trying to run
remote tests.

Fixes: QTCREATORBUG-29183
Change-Id: Idd04cdb8798d04abf88ab6cb4b68eb73d890a482
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-22 11:31:51 +00:00
hjk
67ec9bbce0 QmlProjectManager: Compile fix after Qt source compatibility break
error: operands to '?:' have different types 'QStringBuilder<const QString&, QString>' and 'QStringBuilder<QString, QString>'

Caused by af8f9a2a6e3dbc8.

Change-Id: Ia3dfca2cb5f1cb1855f25d178f63898eb6745c46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-22 11:28:15 +00:00