Commit Graph

82976 Commits

Author SHA1 Message Date
Eike Ziller
d2b61bf3f0 Examples: Order categories
According to hard-coded list. This should come from the manifest file in
the future.

Follow-up of qtdoc/4e38729111989dbb738042d4a8beb35d01b77fe1

Change-Id: If46383e1cf8e44c2a52ca5a458c497495e132639
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 15:03:04 +00:00
Jarek Kobus
152d543cdf TaskTree: Document GroupItem and subclasses
Adapt some type and argument names accordingly.

Change-Id: I1b127eacfd0a71574ee9e9a7628ec572620798cb
Reviewed-by: hjk <hjk@qt.io>
2023-06-26 14:59:24 +00:00
Miikka Heikkinen
2810106c2c QmlDesigner: Fix shader asset source property setting on navigator drop
The property type of the shader source property is url, so use that
instead of bytearray type.

Fixes: QDS-9721
Change-Id: I244ed455f83e3f70d130a6085b9af083ee60c131
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-26 14:17:46 +00:00
Eike Ziller
ac32f790f3 Qbs build: Fix app_version generation
Amends 6836caa14c

which added a variable to app_version.h.cmake, but not to
app_version.h.in. Fix by porting qbs to use app_version.h.cmake, which
is the truth nowadays, instead of the app_version.h.in which originated
from the qmake build.

Change-Id: Ia9be53377a0bfded91ccd6ea1637eeda7fe9d5c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 11:32:22 +00:00
Eike Ziller
68bc213644 Move app logo to main executable
Moves more branding information out of the plugins.

Change-Id: I71575f268dd8f2860f4da56101b0e3d9442df367
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-26 11:29:41 +00:00
The Qt Project
e07e8b5c78 Merge "Merge remote-tracking branch 'origin/11.0' into work" 2023-06-26 11:25:55 +00:00
Christian Kandeler
29ade7d682 Wizards: Speed up JsonSummaryPage::initialize()
The summarySettingsHaveChanged() slot takes a (too?) long time, so at
least make sure we don't call it repeatedly while setting up the page.

Task-number: QTCREATORBUG-29290
Change-Id: Id010c41739a1381212731bb7638d6db87081c3b6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 10:53:55 +00:00
hjk
691c8148a3 ProjectExplorer/RemoteLinux: Consolidate X11ForwardingAspect handling
Change-Id: I7e74f58ab50c84c74ba65f9f64aaa4d0ea73bbb6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-26 10:48:08 +00:00
Eike Ziller
606be1f69f Merge remote-tracking branch 'origin/11.0' into work
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ib4653a1ce75c7cce658f4bb843481de014d0fcf7
2023-06-26 12:12:58 +02:00
Aleksei German
fcab6a10d2 QmlDesigner: Improve project open functions
This patch:
unifies lookup for the first qml file to open;
increases number of possible fallback options;
adds missing implementations to some methods in QmlBuildSystem.

Task-number: QDS-9984
Change-Id: Ib282b1fca8b0564fe80f00e3d9ffe82c1a15c540
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 09:47:57 +00:00
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
Aleksei German
474e7fff47 QmlDesigner: Fix missing property in MCU template
Task-number: QDS-10091
Change-Id: I2f3c0949aea394761eb53f0f20081c1834c8dee5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-26 09:47:47 +00:00
Marcus Tillmanns
456a019f2d Debugger: Don't spam app output
Only errors should be displayed in the App output.
Everything else is just noise.
To keep the information for debugging purpose we log it to the
Debugger Output View instead.

Fixes: QTCREATORBUG-27160
Change-Id: I37301edd2f6638e2b4152d1bf7b89a40c9c3c0af
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-26 07:40:58 +00:00
Marco Bubke
5d4dffdc89 UnitTests: Remove unused matcher
There are no clang test anymore.

Change-Id: I2140c4ff97e0351d627ec7b0f7306e0158fb95ca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 07:40:20 +00:00
Marco Bubke
57c4316e54 UnitTests: Fix dependencies
Change-Id: Ia5e3968aea4ae724f7554c2f7fa7223953236816
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>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-26 07:40:10 +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
Leena Miettinen
ae85af34be Doc: Describe the "Use customized static analyzer" option
In Preferences > Qt Quick > QML/JS Editing.

Task-number: QTCREATORBUG-28996
Change-Id: I0e6945ac7fe82e3c8125438772214fe362da89c8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-26 06:47:00 +00:00
Leena Miettinen
9edb1f524e Doc: Update change log
- Added paths to new options
- Added links to documentation
- Added some articles
- Rephrased an entry

Change-Id: Ifeea256714f307963789535f199a2e2733f56276
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-26 06:46:38 +00:00
Leena Miettinen
7642ce34b0 Doc: Mention qmake support for building apps in Docker containers
Task-number: QTCREATORBUG-28996
Change-Id: I0f5394fa7a4e7ba986c66df8dc73c098186903a9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-26 06:46:23 +00:00
Leena Miettinen
12bcdee809 Doc: Fix instructions for previewing QML files
Change-Id: Ifbc0df8d64ab84adc05d427c0c925221533ea973
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 06:46:09 +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
Leena Miettinen
41c3a4aad6 Doc: Describe the "Default array size" field
In Preferences > Debugger > Locals & Expressions.

Task-number: QTCREATORBUG-28996
Change-Id: I5a54e7a33aa65dc63d91ec0bf977e60e96314a58
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-06-23 13:19:52 +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