Commit Graph

68765 Commits

Author SHA1 Message Date
Miikka Heikkinen
7a04f03bc0 QmlDesigner: Persist manual baking mode value
Manual baking mode is stored separately for each View3D in the scene.

Fixes: QDS-9867
Change-Id: I94590c2bded8486c3b526a427930f15b364eb010
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-12 08:19:14 +00:00
Miikka Heikkinen
ac4219c5cd Qmldesigner: Allow exposing nodes as aliases via UI for light baking
Model and light nodes from subcomponents can now be exposed with a
single button press in light baking setup dialog.

Fixes: QDS-9831
Change-Id: Ifcc69955a2dc9378111387694e42f0cdc70173f3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-05-12 08:18:41 +00:00
Cristian Adam
af5e50edf7 CMakePM: Cancel current build before locator "cm <target>"
In case the current project is building and the user starts a "cm
<target>" in Locator, now the build is canceled before starting a a
"cmake --build --target <target>".

Fixes: QTCREATORBUG-26699
Change-Id: I27ed9ba5b8d917dce94835a5462e4e64e7515bd9
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:17:17 +00:00
Jarek Kobus
62c309eeda AllProjectsFilter: Remove the old matchesFor() implementation
Change-Id: I9b5a0a1483e1dcd55d845ca2a5645ad9a4d05b52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 08:13:42 +00:00
Jarek Kobus
a1792c653e TaskTree: Prepare for de-utils-ization - part 4
Add internal implementation for qtcassert.{c,h}.

Change-Id: I646b302be2f86e32e91c8c6fafa7b799e48773c2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:30 +00:00
Jarek Kobus
fe470d60a2 TaskTree: Prepare for de-utils-ization - part 3
Rename QTC_* macros into TASKING_*.

Change-Id: I809ebf678f20df612a3211c38ebbfe6d4bf6492d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-12 08:09:24 +00:00
Jarek Kobus
97a66067bb TaskTree: Prepare for de-utils-ization - part 2
Move TaskTree into Tasking namespace.
Move Tasking namespace out of Utils namespace.

Change-Id: Ib4c1d7f54f1808517e54768dfa27209c33517b61
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:19 +00:00
Jarek Kobus
5a73d07c72 TaskTree: Prepare for de-utils-ization - part 1
Add internal implementation for Guard/GuardLocker.

Change-Id: I9bcedee937221c0796143be2f943650a1bb56f38
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 08:09:13 +00:00
Artem Sokolovskii
b28df28660 ClangFormat: Remove redundant KeepLineBreaks property
Change-Id: I74250bde4a224d89b078f127da4e7b63454b03a6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-12 07:49:40 +00:00
Artem Sokolovskii
ef06d89255 ClangFormat: Improve conversion from and to ClangFormat style
Improved conversion from ClangFormat style settings to
CppCode style settings and the other way around.

Task-number: QTCREATORBUG-29069
Change-Id: If4f75259f7fe77397fc144a83370749a49d25297
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-12 07:49:35 +00:00
Miikka Heikkinen
2ded8a3842 QmlDesigner: Fix denoiser path for mac
Fixes: QDS-9870
Change-Id: Id847cb6efad0bf1d57e6f159adde68dec1843990
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-12 07:46:57 +00:00
Jarek Kobus
b1d520c6b1 CppLocatorFilters: Remove the old matchesFor() implementation
Move the implementation of CppCurrentDocumentFilter into
cpplocatorfilter.h/cpp.

Rename CppLocatorFilter into CppAllSymbolsFilter to
conform to the other names.

Remove some unneeded intermediate classes now.

Change-Id: Ia911dc826b83ba11894757fc353ff72211910ff7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-12 06:45:27 +00:00
Marcus Tillmanns
0c8ae843c6 Terminal: Switch Mode to ensure visible
Change-Id: I6d92ac07b7f6e7d5ed3fa4d27531d1cb8ec1a36f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-12 06:41:13 +00:00
Jarek Kobus
946da55f6e MacroLocatorFilter: Remove the old matchesFor() implementation
Change-Id: I44869742c590125805eab277464ffde3df3a2bc2
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>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 06:40:57 +00:00
Jarek Kobus
c559bcc4b1 BookmarkFilter: Remove the old matchesFor() implementation
Change-Id: I85b02fcaf73686146fe4da9d8582dd0c677ba101
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-05-12 06:40:49 +00:00
Alessandro Portale
f2213db913 Terminal: Fix warning
warning: dereferencing type-punned pointer will break strict-aliasing
rules [-Wstrict-aliasing]

Change-Id: Ib66cbde9ff48f31d1a5ca97c8bafb0efd419dc2e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:34:49 +00:00
Christian Stenger
979f938aa5 AutoTest: Fix handling of multiple fails of tests
Broke with d05c5b7d07.

Fixes: QTCREATORBUG-29146
Change-Id: If7cc7f943c16113785a21b661a545e00331f1dcd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-12 06:34:09 +00:00
Christian Stenger
1a86c7bed4 Utils: Remove empty item after option
Triggers a soft assert.

Change-Id: I9ad863ceb7e1f377e4f9fbae62cca1d0932a76d6
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:22:17 +00:00
Christian Stenger
d14f1af523 AutoTest: Some layout polishing
Layouts are simpler nowadays. Some drive-by formatting
changes.

Change-Id: If5fd0ff8cf8e39487bfb29d792bdf2d8ddb0342c
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:21:58 +00:00
Christian Stenger
1dfaecfb1e ScxmlEditor: Fix Qbs build
Amends 2d1b8dbc29.

Change-Id: I994b98b3f5b5bd0ae8026f04ddd6c42beb9545e0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-12 06:21:50 +00:00
Björn Schäpers
b8a82d824b Utils: Fix unused parameter warning
Change-Id: Ibe4c866b4f3bf39999cfe43bd32287e069e51d2c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-11 19:06:21 +00:00
Alessandro Portale
fb406a26f4 Utils: Turn StyleHelper into a namespace
It was in fact just a bag of static functions. Most importantly, it
fixes a previouls introduced build error.

Amends 5975657e77

Change-Id: Ia7de8bdcf91e1763f9d3b435316a5df9993717de
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 17:10:40 +00:00
David Schulz
1acd2499e2 Utils: replace LineColumn with Text::Position
Change-Id: Ia69547374efec7412717cbed1eb4162162a89d39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-05-11 17:00:28 +00:00
Marco Bubke
3ff90526f5 QmlDesigner: Introduce SkipIterator
Instead of having a cache using an iterator skipping entries is much
easier because the cache has not to be anymore updated. When we get
C++ 20 ranges use them instead.

Change-Id: If5b45c53bbd0b12138328862ac152788ffd911b2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-05-11 15:55:30 +00:00
hjk
268da290b2 Utils: Guard SelectionAspect value access against out-of-bounds access
Change-Id: I6ca414015cb55f06b7264949487fafc7eb57efd3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 15:08:17 +00:00
hjk
67acfd7076 ProjectExplorer: Use PagedSettings for BuildPropertiesSettingsPage
More compact.

Change-Id: Id35c3e8eeb54039a6769730fecc6b862fefc10e1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 14:27:25 +00:00
Artem Sokolovskii
2d1b8dbc29 Scxmleditor: Add showing onEntry and on Exit events
This commit enhances the SCXML Editor by adding a new
feature that enables the display of onEntry and onExit
events in the state item. This feature provides developers
with a more comprehensive view of the state machine's behavior,
allowing them to better understand the transitions that occur
when entering or exiting a particular state.

Fixes: QTCREATORBUG-17378
Change-Id: Iaf84af209d9acf13bd4183f7da9acbcd6c1c8214
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:59:41 +00:00
hjk
5614696002 Core: Make PagedSettings autoapply by default in the base
Instead of relying (and forgetting...) it in all derived clases.

Change-Id: I5d1dea0ace420d464c39c192278ae6e5db01de90
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 13:43:58 +00:00
hjk
0449a3fdab Autotest: Use new PagedSettings
Change-Id: If93494ef9e3f10e1b7bbc95a3930d3b36e83f8fc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-11 13:43:47 +00:00
David Schulz
74c311d68f ClangFormat: column of Position is 0-based
Amends 5b0c3258bb
Amends e9cd4dd439
Amends a631a0441e

Change-Id: I9dd542dfdf7936bdaf1fb05152228aff3895bccf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-11 13:20:39 +00:00
hjk
7bd3ee8123 Utils: Add more FilePathChooser config options to StringAspect
Will be used in the Beautifier plugin.

Change-Id: I6e70f757a25afcdf1d3e3742357d71503f210b2a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-05-11 12:47:59 +00:00
Jarek Kobus
a631a0441e ClangFormatBaseIndenter: Fix build
Bring back the utf16LineColumn function locally.

Amends e9cd4dd439

Change-Id: Ic10ea0355b75498217e7bc057a3666a276a18a11
Reviewed-by: hjk <hjk@qt.io>
2023-05-11 12:03:17 +00:00
Marco Bubke
dd5730d2a3 QmlDesigner: Simplify conditional import adding
Change-Id: I78e110a81f8117b711968b6be5b4241f96763c41
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-05-11 11:51:58 +00:00
Jarek Kobus
b8390d3544 LocatorWidget: Further simplifications
Change-Id: Ia3a5eade7f49d45d08539b6bb3d2cbaf9fa12242
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 11:43:25 +00:00
hjk
a69f58180c ClangFormat: Compile fix related to LineColumns
Change-Id: I645d448bea8ee22db54b110cf83e58b7b2e20660
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-11 11:23:26 +00:00
David Schulz
80f46c28a5 Utils: fix build
Change-Id: Ibc9050c8b3dd4a1fcba9e87f70b46908dbbd1dce
Reviewed-by: hjk <hjk@qt.io>
2023-05-11 11:00:11 +00:00
David Schulz
e9cd4dd439 Utils: use Text::Position instead of LineColumn in textutils
Change-Id: I606b0b4f8106bdb2f97383d6c81ac065e7e61858
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-11 10:46:01 +00:00
David Schulz
5a0f2e6d15 Utils: move extractFromFileName from LineColumn to Text::Position
Change-Id: Ibb2465e66c280d4201377921f69741a050d94bc1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 10:45:49 +00:00
Jarek Kobus
7d87233c9c ClangCodeModel: Remove the old matchesFor() implementation
Rename some filter classes to conform to the names for cpp filters.
Remove some unneeded intermediate classes now.

Change-Id: Ib4fa295fa60da61c42c792556751d954ddb936e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 10:24:08 +00:00
Tim Jenßen
f3fcce9f4f qds: workaround that appbundle finds the images
Task-number: QDS-9856
Change-Id: I4efe17b7a5daca12f29ac2d63bde3b5c8c3a142b
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-11 09:23:56 +00:00
Tim Jenßen
12d9a31f17 qds: use QtQuickEffectMaker app bundle path
Change-Id: Id267d50007766b2849b71d7ff9393d6de6f9e3c0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-05-11 09:22:42 +00:00
Jarek Kobus
74f6b96315 CppIncludesFilter: Remove the old matchesFor() implementation
Change-Id: I8c65041e22195ecb44e32a8102800c2020298f71
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 09:21:41 +00:00
Marco Bubke
a6ba2354cc QmlDesigner: Cleanup the Qt conditions
We have now demand QmlPrivate, QmlDomPrivate and QmlCompilerPrivate.

Change-Id: I77fa5b506c827b9ba2f7ea18e3ffdd176c1871ec
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-05-11 09:12:13 +00:00
Knud Dollereder
5bf1b598c1 Move mcu deploy step into the mcusupport plugin
This deploy step will run the qmlprojectexporter commandline tool
on the currently active qmlproject if qtForMCUs is set to true.
The output of the tool is shown in the "Compile Output" panel.
Possible configuration issues are shown in the "Issues" panel.
Note that the step is not removed from the list but disabled when
setting qtForMCUs to false in order to retain possible changes made
by the user.

Change-Id: I03b0d6fbe420b49400d48e7365d4395491b9aa2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2023-05-11 08:50:46 +00:00
Eike Ziller
7f5876b45a Merge remote-tracking branch 'origin/10.0'
Change-Id: I98e5e1ad43103984b490c65cdeed84b7414303b3
2023-05-11 10:33:18 +02:00
Artem Sokolovskii
7960c1f3f6 ClangFormat: Fix code style preferences are grayed out
Code style preferences are grayed out even when formatting mode
is set to disable.

Fixes: QTCREATORBUG-29129
Change-Id: Icf82fa0751f9291122c2af55111b6bd5fac85c7b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-11 08:11:54 +00:00
Björn Schäpers
2455ff28cd Debugger: Fix defined but not used warning
Move the currentError function where it is used.

Change-Id: Iba669d677b35abc0c9291572c2ccb1df3cd2ed56
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-05-11 08:06:17 +00:00
Christian Stenger
37cf70aeba Squish: Redo layout of settingspage
Change-Id: I0622423a25942d803f38e85cb4aecd57024666a9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-05-11 06:37:28 +00:00
Jarek Kobus
4b851bbb01 FileSystemFilter: Remove the old matchesFor() implementation
Change-Id: I21e714a7cd89e82eb408f89bfe1271c91758f13a
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>
2023-05-11 06:29:20 +00:00
David Schulz
24aea361b7 Utils: remove OptionalLineColumn
LineColumn already has a isValid() that is sufficient for the use case.

Change-Id: I7f6e1d64b66a9af05d74ce0ef45717265dc28ed3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-05-11 05:53:56 +00:00