Commit Graph

72811 Commits

Author SHA1 Message Date
Eike Ziller
1b97fdc100 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	src/plugins/debugger/gdb/gdbsettings.cpp
	src/plugins/perfprofiler/perfprofilerruncontrol.cpp

Change-Id: I0d5b914f9d9b5499920a5db484ef77af6ae748d5
2024-03-12 09:27:39 +01:00
hjk
68347c9c9b Debugger: Avoid a soft assert on QmlEngine shutdown
Change-Id: Id26b41e878ed2b8b20099b62ed1c122966165665
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-12 08:16:27 +00:00
David Schulz
9934a9cafa Debugger: improve tooltip handling for cdb
Fixes: QTCREATORBUG-13413
Change-Id: I93cde8d11867ab8cec8a2f760f0f38a0935fe946
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-12 06:57:57 +00:00
Tim Jenssen
e7e9a58e46 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I8cd3cdf5854299d3017d6c6bfa656fc483a0e20b
2024-03-11 17:18:48 +00:00
Marco Bubke
09b00446b7 Utils: Make ranges dependency more explicit
Seems it does not work with MSVC and Mac OS

Change-Id: I16fc72476021d88d02b0c0d2794ee726cde77272
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 15:28:56 +00:00
hjk
96d44d375b LanguageClient: Suppress a compiler warning
warning indentation; statement is not part of the previous 'for' [-Wmisleading-indentation]
                    if (__builtin_expect(!!(clients.removeAll(client) == 0), true)) {} else { ::Utils::writeAssertLocation( "\"" "clients.removeAll(client) == 0""\" in " "/data/dev/creator-out/src/plugins/languageclient/languageclientmanager.cpp" ":" "114"); } do {} while (0

Change-Id: I14297567627801d3a5436abf2df8fec23bff85dd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 14:46:26 +00:00
Sivert Krøvel
68e178c041 McuSupport: Read versioned settings keys for MCU dependencies
In an accompanying change, the installer writes versioned
settings keys. The version string will be appended to the
existing key, after a single underscore character.

When reading from the settings, the plugin first looks for
keys matching one of the requested versions from the kit.

Optionally, if no key for a matching version is found, the
key for the newest version available is chosen. This only
applies to the Qul SDK package for the time being.

If no suitable versioned key is found, the plain unversioned
settings key is picked

Task-number: QTCREATORBUG-29194
Change-Id: I2db888390cfb64a4b7c78ebcf795543251cb7a1b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-11 14:37:57 +00:00
Dominik Holland
18e1c36648 boot2qt: Fix reading the perf record args
Change-Id: I0b181dc05a409a38cbd87366a0cb6631c900ed24
Reviewed-by: hjk <hjk@qt.io>
2024-03-11 14:14:00 +00:00
Jarek Kobus
54205c1b62 Axivion: Replace local lambda with static method
No need to create lambda on every call to credentialKey().
This should remove the warning about the
Performance inefficiencies (AUTO_CAUSES_COPY).

Change-Id: I9a7dc9cabcc6f80e58e39ef8be6a5445a11e0433
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 14:09:05 +00:00
Jarek Kobus
d30f97ac7e Axivion: Pass arg by const reference
Amends 0b0941cbcb

Change-Id: I61cfe511be6627a347b330a6833f5d7a4afe3f1d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 14:08:13 +00:00
Jarek Kobus
cd4ec16f6e Axivion: Show error string on error's deserialization error
Change-Id: Ib8cd3d336508f1a4e12465456254b02c556ac38b
Reviewed-by: Andreas Loth <andreas.loth@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 14:08:05 +00:00
Christian Kandeler
2607e07b20 CppEditor: Try to handle "declaration macros"
Fixes: QTCREATORBUG-13640
Change-Id: I6566add09011388627c62394dfc3e47d29bac9cd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-11 13:33:26 +00:00
Christian Kandeler
8c5c849b71 CppEditor: Refactor AddBracesToControlStatement quickfix
Preparation for bracifying if-else chains. No functional changes.

Change-Id: Idc101131c02aac88598a6de1f8f511f89c958346
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>
2024-03-11 13:30:35 +00:00
Marco Bubke
e82a6fc37c QmlDesigner: Fix C++ 20 capture error
Change-Id: Iba9b702878c3c04f1b10efd2b518f1a3054c5a55
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 12:58:34 +00:00
Miikka Heikkinen
2f4ff01b7a QmlDesigner: Add "Edit in 3D View" context menu option
This option is only shown when View3D item is selected.

Fixes: QDS-12207
Change-Id: I0a98b59a5eb3fe7abd689711939b649fe496eeb7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-11 12:49:51 +00:00
David Schulz
325db93a7b LanguageClient: improve clangd function hint
Add a Clangd specific function hint model that alwys highlights the
current parameter based on the number of commas in front of the cursor
position, like the builtin code model. It also correctly closes the
proposal after typing the closing parenthesis.

Fixes: QTCREATORBUG-26346
Fixes: QTCREATORBUG-30489
Change-Id: I09d3ac6856acfe5e0f206d8c3a96dbb561ea2ce7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-11 12:39:06 +00:00
hjk
b7b78df8be Require C++20
Prevent introducing C++20 problems for the master merge.

Change-Id: Id6581a4c32ec6411195edb51339f017e4ddb51ff
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit e678da9934)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 12:09:37 +00:00
Eike Ziller
3dbdad20dc Utils: Fix build with MSVC with C++20
Rename process.h back to qtcprocess.h

MSVC's "threads" standard header includes <process.h>, and that ends up
including our process.h from Utils.

There already was a hacky workaround in place for a similar issue with
MINGW, but that doesn't work with MSVC because that doesn't have

Simply use a name that doesn't conflict.

Change-Id: I1159cd2096b4f2dbc4a1728d0131dd6edd30ebd3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 5af531cd39)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-11 12:08:33 +00:00
Eike Ziller
3cc4e22cdc Utils: Fix build on macOS < 13 with C++20
The Clang implementation of span is incomplete until
LLVM 15 / Xcode 15 / macOS 13.5

Change-Id: Iac8514fc84643cb4dae9cfaac603df5e798f9ff4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
(cherry picked from commit db5ac2dc15)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-11 12:06:49 +00:00
Marco Bubke
8b7762621b QmlDesigner: Change model creation to new code model
The model needs the project store, the path cache, the imports and the
file path. So we now use a method in the model to copy them over to the
new model.

Task-number: QDS-12102
Change-Id: I80f911d55c5a5fdf9d1a87c1f4888e498086374b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-11 11:23:33 +00:00
Marco Bubke
6ebb7923b2 QmlDesigner: Deprecate optionally old node meta info API
If the project storage is activated the old API will be deprecated.
Hepefully people now stop to use the old API. You can still use it but
you have to write an implementation for the new one too.

Task-number: QDS-12102
Change-Id: Iac23da1648ff44e27a2ee7840e0d3eeb1fb8caf9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-11 11:23:27 +00:00
Christian Stenger
27c02d94af Debugger: Fix persisting of debugger settings
When triggering them from the context menu while debugging.
Fix used settings group when triggering writeSettings() on
the aspect instead of the AspectContainer.
Explicitly persist respective settings when triggering them
on the context menu.

Fixes: QTCREATORBUG-30491
Change-Id: I6f429bb54630cbe61c8b2ee063028f323a2d08f6
Reviewed-by: hjk <hjk@qt.io>
2024-03-11 10:46:22 +00:00
Alessandro Portale
477f4e18eb Welcome: Design update round
User feedback was gathered and in part implemented in form of a design
update:

- Update dark and light tokens
- Add Token_Text_Accent and use it for session/sroject names, tags, etc.
- Change card hover from Token_Foreground_Subtle to
  Token_Background_Subtle
- Remove font-style changes on hover

Change-Id: Ia428d43828c9c76ea91d142356457846b932e2d6
Reviewed-by: hjk <hjk@qt.io>
2024-03-11 10:25:35 +00:00
Alessandro Portale
3e0c302a6c ScreenRecorder: Make Crop&Trim dialog maximizable
Give the dialog back its minimize and maximize buttons (on Windows),
without setting the Window flag.

Amends: 24796279f3

Change-Id: I2bca972c0351d0749ea3771e418449a052703329
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-03-11 09:51:57 +00:00
Miikka Heikkinen
572205691f Doubleclick on View3D item in 2D view will open 3D view
Also if the click was over a visible model in View3D, that model will
be selected. 3D view edit camera will be aligned to the scene camera
currently in use.

Fixes: QDS-12188
Change-Id: I25823dbbcf9d1706b2cdefb8c34aa78ecd93e407
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-11 09:19:41 +00:00
Volodymyr Zibarov
5895ad5659 [cmake] Fix follow symbol for add_subdirectory to not jump to target
Skip targets list if function name is add_subdirectory

Fixes: QTCREATORBUG-30510
Change-Id: I8c601fb2134fc8a9b2814df01f6ec5eec380c51a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-03-11 09:00:51 +00:00
Christian Kandeler
8295f11576 CppEditor: Skip redundant check for large files
The only caller of refreshSourceFiles() is updateSourceFiles(), which
already does the respective filtering.
Amends 1960503ae9.

Change-Id: Ief7b2a728138c3693276edbd1912fa59cadaf4a6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-11 08:18:56 +00:00
Christian Kandeler
f4916b3125 Core: Lower the document auto-suspension threshold again
This was already done in 509600da99, but
accidentally reverted by a refactoring in
7f908d737b.

Task-number: QTCREATORBUG-29943
Change-Id: Ica3df46fa9610729629704746a8e1003bb89f465
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-03-11 08:18:13 +00:00
Alessandro Portale
2f290e6dc0 ProjectExplorer: Fix KitManager::deregisterKits
There were some problems regarding removal of the default kit:
  - A precondition of setDefaultKit() was violated.
  - The new default kit was set to a kit that was possibly removed later
    as well (and never updated afterwards).
  - The new default kit was only set if it wasn't null, leaving a
    dangling pointer in m_defaultKit.
Also turned some checks into assertions.

Amends e31a06a0f4.

Done-by: Christian Kandeler <christian.kandeler@qt.io>
Fixes: QTCREATORBUG-30493
Fixes: QTCREATORBUG-30502
Change-Id: I3283f02c90d0ec84b579d7cfdf845b03663f5768
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-11 07:43:53 +00:00
Eike Ziller
2484b50a99 Fix Fullscreen action text
On macOS the action was correctly switching between "Enter Full Screen"
and "Exit Full Screen", but on Windows & Linux the text was fixed to
"Full Screen" and the code tried to set the check state - but forgot to
make it checkable in the first place.

Actually it is unclear what the "correct" behavior is on Windows &
Linux. Neither on Gnome or KDE or Windows the action shows a check mark
when in Full Screen mode though. Either there is a tool button with an
icon, or some variation of "Exit Full Screen" or "Leave Full Screen".

Change the text of the action on all platforms, use "Exit Full Screen"
on all of them, but stay with just "Full Screen" on Windows & Linux (as
opposed to "Enter Full Screen" on macOS).

Fixes: QTCREATORBUG-30365
Change-Id: Ic55a30e32302ceb12f75449781b1aefecb370c97
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-11 05:21:55 +00:00
Christian Stenger
db31db26dd Axivion: Provide some context menu for issues table
Provide actions to open the selected issue or table inside
the system web browser.

Change-Id: I43d31368444fd4664db7d908c40b898e430cede3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2024-03-11 05:21:24 +00:00
Shrief Gabr
836c0a11e4 EffectComposer: Open effectComposerNodes/images by default in UrlChooser
Task-number: QDS-11464
Change-Id: I96bb7e359bd41637f0b1906a523c8a5de190981d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-08 13:56:22 +00:00
Ahmad Samir
71e6916b37 FileIteratorWrapper: fix typo in "__qtc__devices__"
It should be what FilePath::specialRootName() returns,
"__qtc_devices__". Looks like nothing used the string retured by next()
so this didn't cause issues before.

Change-Id: Ib9c48d8ea032b1ca7d9ec08003f9d51c5a2ae528
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-03-08 13:32:59 +00:00
Ahmad Samir
5760654674 FileIteratorWrapper: remove redundant if statement
Change-Id: I5b9a50802adc3d2cfc48748235a7cd6ee01fa5a4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-03-08 13:32:40 +00:00
Ahmad Samir
2f78fd4358 FileIteratorWrapper: simplify constructor
The other two parameters, QDir::Filter and nameFilters string list, can
be retrieved from the baseIterator.

Change-Id: Id33a95f3b490e8f5846e9728fc66da0df5195be9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-03-08 13:32:20 +00:00
Shrief Gabr
d786001fa1 EffectComposer: Add color channels to the Opacity Mask effect
Task-number: QDS-11417
Change-Id: Ie35e4da6c12a78fd808a6264f643ce2b3b1f62d2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2024-03-08 09:31:37 +00:00
Mahmoud Badri
5d497a3b7c QmlDesigner: Add screenRect() and globalPos() to prop. editor context
...so that CustomComboBox's popup work. Also small tweaks.

Change-Id: I8c4638e6710db80aa59da326af868ab6f6917e55
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-08 09:23:03 +00:00
Alessandro Portale
24796279f3 ScreenRecorder: Fix widget colors in the Crop&Trim dialog
panelWidget() and isInUnstyledDialogOrPopup() in ManhattanStyle.cpp
would mark the contents of this dialog as "panel widgets". In order to
evade this, we don't set the dialog type of the Crop&Trim dialog to
Qt::Windows.

The author of this dialog did not leave us a comment on why Qt::Windows
was chosen, so we can assume it was done for no particular reason.

Fixes: QTCREATORBUG-29893
Change-Id: I90f653e39cee839203b8767cb30eadab69baaf09
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-03-07 19:26:46 +00:00
Cristian Adam
47018e59d2 Android: revert to using 'threads' in handleJdbSettled
But this time ignore unhandled exceptions which were caused by the
'threads' command in certain situations.

Amends db307978bf

Change-Id: I50819306eeb392ebae8dc869694ed588739c44fb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-03-07 17:18:57 +00:00
hjk
e71de0d0c1 Appman: Code cosmetics
Use less specific #include to get EnvironmentAspect.

Change-Id: I570c6a0871c63f5857d56ff640e95f10463fce5e
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2024-03-07 16:27:29 +00:00
hjk
ef569cc05d PerfProfiler: Un-export and de-Q_OBJECT-ify PerfRunConfigurationAspect
Not needed anymore.

Change-Id: Iadeed22e90ab98ae5db0a4305af7c862fc2a1810
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2024-03-07 16:27:22 +00:00
hjk
4c0991b25d PerfProfiler: Make perf record args accessible
... without creating a hard dependencies.

Change-Id: I07b40dd9f1a4f53c5279d36f44e2a9123a34fa74
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2024-03-07 16:27:08 +00:00
Artem Sokolovskii
b24acbc28b ClangFormat: Fix General tab is missing
Fixes: QTCREATORBUG-30501
Change-Id: Ic1f09e513114acf6fb6ee52c8b5f066a2071e202
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-03-07 14:37:15 +00:00
Eike Ziller
da9afa8cc7 ModelEditor: Remove multiline text from action text
It is supposed to be shown in the tool tip, so set the tool tip instead.

Fixes: QTCREATORBUG-29174
Change-Id: Ib2572b71dfccf18276e63fadb7dbe386949b0275
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-07 13:52:00 +00:00
Christian Kandeler
2524e2adb3 CppEditor: Let users provide statement macros
Like ClangFormat has.

Fixes: QTCREATORBUG-15069
Fixes: QTCREATORBUG-18789
Change-Id: I0ffb70be502d1c73aaaf436484ddc6704f152621
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-07 13:45:31 +00:00
Christian Kandeler
cdd85477fb ClangTools: Put a clazy setting to its proper place
We do not go out of our way to retain the old settings value, as the
setting affects only the UI behavior in the same widget it is displayed
in.

Change-Id: Ie0d66b3909364e15a05013eddaf742b161941f67
Reviewed-by: David Schulz <david.schulz@qt.io>
2024-03-07 12:48:41 +00:00
Marcus Tillmanns
22f41fb751 ModelEditor: Fix crash when selecting items
Fixes: QTCREATORBUG-30413
Change-Id: Ie637e20d6308da2e1afcf3ff710f29c6a1695d58
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-03-07 12:16:31 +00:00
Mahmoud Badri
47dd925730 QmlDesigner: Add HelperWidgets FlagsComboBox
Change-Id: I05294aa1483926d943f8a40d1d9702298110fe94
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-07 12:08:43 +00:00
Alessandro Portale
c936fc5982 Welcome: Determine maximum width for Core::Button text for all states
Button states can have individual text tokens assigned. Depending on the
used fonts and platform-specific renderer, any of these states may have
the highest widts. Consider all of them and use the maximum.

Change-Id: I51caccef9e34c1911c2773b8836dba722ad63c47
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-07 12:00:04 +00:00
Christian Kandeler
256105d75f Update qbs submodule to HEAD of 2.3 branch
Change-Id: I0e97c91701030674cba363a692c2c9765a4aedbd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-07 11:51:54 +00:00