Commit Graph

72811 Commits

Author SHA1 Message Date
Jarek Kobus
61cf8702a3 Axivion: Separate fetching Dto data from credential handing
Change-Id: Ibddafa055c73614797235921ba5cb62096b5980f
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>
2024-02-15 06:42:39 +00:00
Jarek Kobus
bc4c3b87df Axivion: Add Username field
Change-Id: Icafedc1c79ceb48349975576b99a7da7dd39f353
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-15 06:42:28 +00:00
Jarek Kobus
e059b62421 TaskTree: Fix progress reporting with LoopUntil(false)
Advance the progress value by the group's children count when
LoopUntil handler returns false on the first iteration.

Add a test for it.

Change-Id: I3783dd295dfaa16c09c5eda299f365ff981b3be7
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>
2024-02-15 06:42:07 +00:00
Christian Stenger
cf53f157f7 ExtensionSystem: Fix initialization and silence logging
Avoids crash on start when running tests.

Change-Id: I924290f1d7c5d079ed96112e3d2375e53428221f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-15 06:02:39 +00:00
Christian Kandeler
e1b3c3e357 ProjectExplorer: Warn against "special" characters in build directories
There are still tools around that have problems with such setups, so we
turn this warning on by default and let the user opt out.

Fixes: QTCREATORBUG-20834
Change-Id: I01a2e0fa931bec74add43b37cb042712635f3175
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-14 17:12:42 +00:00
Ali Kianian
e4fe45f237 QmlDesigner: Add beta tag to the title of the Model Editor view
Change-Id: I2eff47c56928a6e49405b646ff7a98b205d9d6fe
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-14 16:00:20 +00:00
Marcus Tillmanns
b39b192518 ExtensionSystem: Refactor PluginSpec
Splits the functionality between plugin type specific and general.

Allows Plugins to be loaded after the first pass, e.g. for Lua scripted
plugins.

Change-Id: If2712817a672c49d554fdc308250cb06ca7eb3f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-14 14:33:16 +00:00
Eike Ziller
bcf0d8c319 Merge remote-tracking branch 'origin/13.0'
Change-Id: Iaf7373d449668bba57e53810858b58e2ec83dcc0
2024-02-14 12:48:53 +01:00
hjk
0a1783d656 Utils: Rename NameValueItem to EnvironmentItem (1/2)
Only used in Environments nowadays.

Change-Id: I64a645ebebd5cb57c50d5d8f72a5e4dba40e122f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-14 11:33:53 +00:00
Jarek Kobus
91c1c244a1 ModelManagerInterface: Cancel all running threads on session switch
On session switch we cancel all the running tasks.
We connect to the SessionManager::aboutToLoadSession()
signal, as this one is emitted just before loading
new session's projects. We don't connect to
SessionManager::aboutToUnloadSession(), since after
this signal is emitted the unloading may be canceled
due to e.g. showing the dialog asking for saving
changed files in the unloaded session (the user may
cancel the process of unloading).

In contrast to what we do on shutdown, we don't wait
for futures being finished here - it's just enough we
cancel all of them.

Fixes: QTCREATORBUG-25583
Change-Id: I01eeca00d150f6e98a80a050c6a19efb848b9954
Reviewed-by: hjk <hjk@qt.io>
2024-02-14 11:28:59 +00:00
hjk
83eaeda954 Utils: Merge NamesValueModel and EnvironmentModel (2/2)
Rename namevaluemodel.{h,cpp} back to environmentmodel.{h,cpp}

Change-Id: Idfa528b0c1c307ef4cd9dd5869f18993647b98bc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-14 11:16:37 +00:00
hjk
090fd0e5f5 Utils: Merge NamesValueModel and EnvironmentModel (1/2)
The abstraction is nowhere used (anymore?)

In order to keep the diff small, this here merges environmentmodel.{h,cpp}
into namevaluemodel.{h,cpp} which will be renamed back to env* in a
second step.

Change-Id: I1e7c14012ec3d3f54d8557f4b737a59ede2283e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-14 11:13:11 +00:00
Jarek Kobus
0d1831b462 Mercurial: Remove unused lambda captures
Change-Id: I5b308dc57b10624d140ed506a17ed41b3ec49491
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-02-14 11:05:10 +00:00
Christian Stenger
52f9709300 QtKeychain: Build lib with qbs
Change-Id: Ief16859fd26b130aef474c6caae64f2faacbe7f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-02-14 10:51:45 +00:00
The Qt Project
0ea527c915 Merge "Merge remote-tracking branch 'origin/13.0' into qds/dev" into qds/dev 2024-02-14 10:46:30 +00:00
Burak Hancerli
bf5d094ef6 GenerateQmlrc: Do not create package if user cancels the operation
Change-Id: Ie8f2bed23d6c9b4c8496b9b75310fc8cda823088
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-02-14 10:23:19 +00:00
Tim Jenssen
6d632e0d93 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I9e4eb40209acf04c66b12e595ec9e2234d859294
2024-02-14 10:10:03 +00:00
Eike Ziller
7b57ae31f6 Avoid automatic creation of performance data related .json files
Amends 1a84ae038d which enabled building
the Nanotrace library by default. The part that is used for startup
performance logging is only enabled at runtime with the `-trace` command
line argument, but some logging using the "hr" variant was automatically
created. Disable that part at compile time by default.

Fixes: QTCREATORBUG-30331
Change-Id: I8add207c760bfe2dde52534f55feb7b637ccb600
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-13 20:47:13 +00:00
hjk
a26aff7afd Debugger: Report full sizes instead of the elide setup
More direct communication of the meaning. Use 'length' when talking
about things like string lengths, and 'size' for sizes in bytes.

Task-number:  QTCREATORBUG-30065
Change-Id: Ifed84a5dab4ed890973c1abf4d427655eb50a61a
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-13 17:01:23 +00:00
hjk
02d930b210 Debugger: Improve display of elided string data
This was not adding the length before.

The problem that the size is suddenly off by a factor of two for
QString as elision counts bytes is still present.

Change-Id: Ibcb595dc2d9aaa73b3feec955b4d14613307797f
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-13 17:00:23 +00:00
Jarek Kobus
fc9863c768 NetworkQuery: Support more operations
Make it possible to PUT, POST and DELETE.
Add setWriteData() method, to be used with PUT and POST.

Change-Id: I99da38b60120b7efdab391db9b4d638f17d555df
Reviewed-by: hjk <hjk@qt.io>
2024-02-13 16:57:56 +00:00
Christian Kandeler
322dcd2c45 CppEditor: Re-add function decl/def switch handler
Was accidentally removed in 3771eb196b.

Fixes: QTCREATORBUG-30363
Change-Id: Ifef1266b144d2eb5b7b69ff3e721f781b4455e96
Reviewed-by: hjk <hjk@qt.io>
2024-02-13 16:27:28 +00:00
Jarek Kobus
e7670dd9db Axivion: Simplify string constructions
Change-Id: I6dfefbcba47486a16f793c46c281c7f0fb2e888d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-13 14:28:23 +00:00
Marcus Tillmanns
4cd5bdc4f6 LinuxDevice: Show warning if terminal open fails
Change-Id: Ifb7a628e7d3f253d834cf8e6503db087def64e0f
Reviewed-by: hjk <hjk@qt.io>
2024-02-13 14:21:04 +00:00
Marcus Tillmanns
f905ad1aa6 Terminal: Fix handling stub timeout
Change-Id: Idaf18ac404d878382d5912793a667200bd7fe6f9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-13 14:20:31 +00:00
Christian Kandeler
5937f1b78e Update qbs submodule to HEAD of 2.3 branch
Change-Id: Ideb5c401beb5f512e47ab3e6f7c32fe6e7edda1e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-13 14:15:11 +00:00
Tim Jenssen
adcac7cb6b Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I242c01e82fc1b0db1f5e88c35d526f91dd022337
2024-02-13 14:33:35 +01:00
Marcus Tillmanns
e8ad29d3af LinuxDevice: Add disconnected state
Change-Id: Ic2c909e3375a9fb025a335c1ca65621fa031d000
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-13 11:49:47 +00:00
Knud Dollereder
ea03bfea10 QmlProjectManager: Cleanup cmake generator
- Consider qmlModules file like any other qml module
- Use ${CMAKE_PROJECT_NAME} when possible
- Break up big functions into smaller ones
- Reorder arguments for tpl files

Change-Id: Ie73cca8596b22adf67eba1019610a00c34976421
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2024-02-13 10:15:35 +00:00
Christian Kandeler
39527bbcad ProjectExplorer: Get rid of mysterious "keep size" mode
... in MiniProjectTargetSelector.
It's unclear what the intention was, but the effect was that the widget
was growing after every project switch.

Fixes: QTCREATORBUG-28954
Change-Id: Iea83243194c08ebb3caf78bc058774f17f23eced
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-13 09:41:41 +00:00
Jarek Kobus
231e7da761 Axivion: Drop known namespace specifiers
Add more "using namespace".

Change-Id: Ib207d14c79c692eb87d52cbc95917539c88f0536
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-02-13 08:43:26 +00:00
hjk
9c4bd40f7c Debugger: Fix Qml debugger rampdown when not fully started
Fixes: QTCREATORBUG-30355
Change-Id: I3e7c1ef56db1fe48f5b571d21f89d20b7936cfb7
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-13 08:32:59 +00:00
Jarek Kobus
acb449bb2b TextEditor: Fix a leak of CompletionAssistProvider
The c'tor of QmlJSEditorFactory allocates QmlJSCompletionAssistProvider
and sets it via setCompletionAssistProvider.
The QbsEditorFactory subclass allocates QbsCompletionAssistProvider
and overrides the previous one via setCompletionAssistProvider.
So, the old one was leaking.

Use std::unique_ptr to ensure the ownership.

Change-Id: I6fb7da2b97c50919e422482c858d3503403b788d
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-02-13 08:26:23 +00:00
Marcus Tillmanns
8313190ee9 Terminal: Fix nullopt access
Change-Id: I758dadc481b3ebe6b7274ab0dde52ec5f2d7dfa3
Reviewed-by: hjk <hjk@qt.io>
2024-02-13 08:21:54 +00:00
Christian Stenger
f8383a44aa Axivion: Tweak fetch for issues
Fetch issues for all kinds of issues instead of just
style violations.

Change-Id: I23508ae3c051cabab644f359daec4924034cb65c
Reviewed-by: Andreas Loth <andreas.loth@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-02-13 06:29:56 +00:00
Miikka Heikkinen
93993c322e EffectComposer: Fix effect preview zoom
Zoom must scale the component showing the preview, not the source
image. This way the effect stays consistent regardless of the zoom
level.

Fixes: QDS-11899
Change-Id: I550eb9ff693c24a853f5c25d9d79fa146448663f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-12 14:32:37 +00:00
Ali Kianian
c90970afed QmlDesigner: Insert proper value for booleans to CSV exported files
Fixes: QDS-11823
Change-Id: I4d5a73b982261f59192d7877fe682057c5181d7b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-02-12 14:22:43 +00:00
hjk
844e005363 BinEditor: Use a few more qint64 instead of int
Change-Id: I4907cba425fd213cc2411d20919ff67e2dce71c4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-12 14:07:18 +00:00
hjk
ff85a58ce5 BinEditor: Use 64bit positions in a few more places
This fixes drawing of search hits across the 2^31 boundary.

Searching itself is still buggy.

Change-Id: Icac1722e2693585aa7afe62076ccec9459c18f3a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-12 13:22:05 +00:00
hjk
dbc68fe3aa BinEditor: Allow selections beyond offset 2^31
Fixes: QTCREATORBUG-30282
Change-Id: I18c6ee313b07d3e0606b7fc1e661ef6c90e026e9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-02-12 13:10:50 +00:00
Alessandro Portale
1726d8a0c8 Welcome: Fix font sizes
Fixes: QTCREATORBUG-30305
Change-Id: Ib00bd75c091c6caadd110aaf8e2c12abcbe16cea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-12 13:10:19 +00:00
Ali Kianian
1f9e41ac9a QmlDesigner: Keep the order of columns for imported jsons
Fixes: QDS-11670
Change-Id: Ia068bbb864065b648cffcab2c3477d3cec7f25f8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-12 12:37:14 +00:00
Cristian Adam
7f1e16172a CMakePM: Traverse the whole inheritance tree for Presets
Regarding QTCREATORBUG-30288, before this change I was getting on macOS
presets for Linux and Windows.

Fixes: QTCREATORBUG-30236
Fixes: QTCREATORBUG-30288
Change-Id: I4772ab7d14dec857b68164d4c24e6e904f20c88b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-02-12 11:45:15 +00:00
Christian Kandeler
1af555ad09 ClangCodeModel: Let users configure the clangd index location
Fixes: QTCREATORBUG-27346
Change-Id: I9bc59f759682e70b761c0f22a011868008fc0360
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>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-12 11:38:57 +00:00
Artem Sokolovskii
0afe354952 Android: Update Android Stidio jdk detection
Fixes: QTCREATORBUG-28866
Fixes: QTCREATORBUG-30322
Change-Id: Id7908301a6c6acb540e6a7d575cc6b8b95cdf5d6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-02-12 11:38:20 +00:00
Marcus Tillmanns
291a893f5f VCS: Allow remote vcs operations
Both VcsBaseClient::vcsBinary() and VcsBaseClient::processEnvironment()
get an additional parameter "FilePath target" to allow selecting binaries
and environment based on where the repository is located.

This allows to select e.g. a git binary on a remote device, and the
environment of the remote device for each VCS operation.

A bunch of file path operations are either fixed or ported to actually use
FilePath correctly.

Change-Id: I6afc645772fde3dff3ec19c13efe538e5888e952
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-02-12 11:25:06 +00:00
Marcus Tillmanns
e21b8e0c1d Utils: Add FilePath constructor for TempFileSaver
Change-Id: I15286be055bd69544e4283740bd0c3411573475c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2024-02-12 11:24:05 +00:00
Christian Kandeler
44fa834f2b Update qbs submodule to HEAD of 2.3 branch
Change-Id: I13b506ee25d9f3668a8f995a7ddc3a95752780eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2024-02-12 11:17:51 +00:00
Cristian Adam
87c67fc6d7 CMakePM: Only display CMake preset Kits in the project setup page
Fixes: QTCREATORBUG-29535
Change-Id: I87c16c24a8548efb4374af342947d342e19cc510
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-12 09:55:27 +00:00
Cristian Adam
c553d63a32 PE: Allow ProjectImporter to filter kits in TargetSetupPage
Amends b9f546cf1b

Change-Id: Icf64f3cd751480c9fe2ae740f47954a62c252cc4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-02-12 09:55:20 +00:00