Commit Graph

85691 Commits

Author SHA1 Message Date
Alexandre Laurent
0bbb5ebccb Update missing French translations
Change-Id: If5bb73eaad3b76b107360f946adc02648e0285ce
Reviewed-by: Johnny Jazeix <jazeix@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-30 10:16:17 +00:00
hjk
41184bc9fc Utils: Use numberedKey(Key, int) more wildly
Will ease transition to a key class that doen's have ::number()

Change-Id: Ib2f2957c916f41b0731a2033422bfbf7e429bcc8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-30 09:57:23 +00:00
Aleksei German
b46a0e8e1d QmlDesigner: Fix MCUDefaultStyle usage via wizard
Task-number: QDS-10420
Change-Id: Icef96452c1f7c84accc95b67f3e0b2044e8416c4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-30 08:44:26 +00:00
Aleksei German
6eba95d406 QmlDesigner: Move MCUs qmlproject template
Change-Id: I513062dac4e47e4bf8b113351ceaf040c1180675
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-30 08:44:20 +00:00
Ali Kianian
9bcb31b186 QmlDesigner: Modify the failure for two tests
- Multiple statements are not allowed
- Matched statement should have the same type in the case that we
have both Ok and Ko statements

Change-Id: I2aedc1fe7f7f2096af0293c019d0caeb9771646f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-08-30 08:32:34 +00:00
Eike Ziller
9dc9a43f40 Adapt find tool bar input fields to searched widget's font
Adapt the font of the search and replace input fields to the font of the
widget that is searched. This makes it use the text editor font when
searching in the text editor but keeps the "application font" when
searching in other widgets.

Change-Id: I8bd3b5dd3d14ab0e774f7272be236c35abd12de0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-30 08:31:20 +00:00
Thomas Hartmann
03cb651627 QmlDesigner: Update tests for connection editor
Change-Id: I4b5e0e3cee269454089a3951e2d2d68eb162fa4b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-08-30 08:30:54 +00:00
Eike Ziller
5becdf676f German translation: Use more direct translation for some "eingestellt"
Change-Id: I3c8912480c8ce4d7cdf23d9c2f0d40dfdebc035a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-08-30 08:20:13 +00:00
Thomas Hartmann
34cef91983 QmlDesigner: Update ConnectionModel
Change-Id: I5be9117284a5eae2437b0a4fc9452694098713f3
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-08-30 08:07:21 +00:00
Thomas Hartmann
0af20575c1 QmlJS: Turn ErrDoNotMixTranslationFunctionsInQmlUi into a warning
Task-number: QDS-10548
Task-number: QDS-7597
Change-Id: I785fbf0f47f0753b257ef5fae1c3bf4afa9b416f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-30 08:07:08 +00:00
hjk
c7710acadd Utils: Use Key more widely in QtcSettings
And adapt user code.

Change-Id: I6efe4ebe6823de4cc862f304a57e041b02c40eac
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-30 07:38:02 +00:00
Jarek Kobus
922da1fbb3 Process test: Prevent empty loop from being optimized out
This should fix the macOS "Run tests" on GitHub Build Bot.

Change-Id: Iae185d47fa33c97c63480b10d5a25a1d4c13f532
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-08-30 07:35:25 +00:00
Thomas Hartmann
61827510c0 QmlDesigner: Add SCXML wizard to QDS
The wizard is only active if the plugin is actually enabled.

Task-number: QDS-10507
Change-Id: I0a41deaa22745db90c3ec04a35109694a2fbc79c
Reviewed-by: Unseon Ryu <unseon.ryu@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-08-30 07:33:16 +00:00
hjk
271405e08e QtSupport: Don't save QtVersions directly after creation
Change-Id: I379262734bf11776d77576b8fca698ce691654b8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-30 07:22:53 +00:00
hjk
7fccf02be7 Core: Use QtcSettings in NavigationWidgetFactory::restoreSettings()
Symmetric to saveSettings() now, and allows for central Key conversions
later.

Change-Id: I3fbf81c51197c9882b1f64ef591398b83aa0d633
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-30 06:56:30 +00:00
David Schulz
e788deb1fc TextEditor: add force update current Editor in action handler
This can be used to update the editor widget connected in the action
handler if the editor widget inside one editor changes.

Change-Id: Idc9ea119aa2eaab34bd249c59ab9dfb255556fa1
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-30 04:15:58 +00:00
Thomas Hartmann
3e0ae7951d QmlDesigner: Add PropertyTreeModel
This model represents all properties in the document
in a tree model.
PropertyListProxyModel allows to flatten a level into a list model.
PropertyTreeModelDelegate exposed a single item to a combobox.

Change-Id: I9b56f1ecc9aa57777356bc795b5a15b17559ae24
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-29 16:03:51 +00:00
Thomas Hartmann
0211943909 QmlDesigner: Fix crash
Change-Id: If3f13e31eba0ec03177c8954a09b73ac60c59c69
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-08-29 15:04:28 +00:00
Mahmoud Badri
64442a7098 QmlDesigner: Implement removing a composition node
Fixes: QDS-10410
Change-Id: I4c4922c82f294d676dbf1e82f8c6dbb0f4089fdb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-08-29 15:04:00 +00:00
Mahmoud Badri
a37d028443 QmlDesigner: Add an optional close button to the Section
Change-Id: Ia74fc19a10a40290626c20e57150c444d394523d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
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>
2023-08-29 15:03:45 +00:00
Tim Jenssen
e2a8f1dc51 Revert "Sqlite: Flatten calls inside functions"
This reverts commit 2a301d41c4.

Reason for revert: msvc uses a different syntax

Change-Id: Iec4ae2a65e6957c6e1368cc481a63fab0e55ce9e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-08-29 14:47:19 +00:00
hjk
79bf9acd1b Utils: Allow storeFromVariant(QVariant())
This appears in reality.

Change-Id: Ib09a737a3378e26d88397dceb32a38c3857ec9b2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-29 14:35:31 +00:00
hjk
735e9fc58e ProjectExplorer: Remove ToolChain updating code from 4.3
The current format is apparently stable since May 2017.

Change-Id: I8be705c87578f0e93dbb9494206ccf3e5d8b9e64
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-29 14:10:25 +00:00
Miikka Heikkinen
84e537f313 QmlDesigner: Add scale and rotation snapping to 3D view
Fixes: QDS-10464
Change-Id: I9b327b21a3e09313664b2b4b47772e3cb4244327
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-29 14:03:36 +00:00
Marco Bubke
8af0528893 Sqlite: Improve insertUpdateDelete
Instead of a value we keep the iterator. That is saving us a useless
copy because the value range cannot change.

Change-Id: I2ea36b5a08e378f8e148f317c3384e4c4954a439
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-29 13:49:07 +00:00
Marco Bubke
a20839f8c3 Sqlite: Reset is noexcept
Change-Id: I4d702619e17118681a46dbc904038031a6f98353
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>
2023-08-29 13:48:59 +00:00
Marco Bubke
fc99f914df Sqlite: Make simple getter inline
Change-Id: I8bba89a45f32a6491ca3bfef4535b5183c98382a
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-29 13:48:53 +00:00
Marco Bubke
2f30ad1eb5 Sqlite: Disable locking test for release
Change-Id: I7a54241bdddb23f9b0b3bddbf10844d9eff36cc4
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-08-29 13:48:46 +00:00
hjk
bd89cc1fd5 ProjectExplorer: Avoid a QTC_ASSERT for a legitimated situation
Change-Id: I07ce3a286e366c039497379f8bfd2a7be9523c75
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-29 13:41:03 +00:00
hjk
5839a09e72 Utils: Key/Store fix for Qt < 6.5
Change-Id: Ibf11f01a9502ab7da052db7630b5df2fdeda09ab
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-29 13:30:23 +00:00
Cristian Adam
d9a8eba35d CMakePM: Enable cmake format action only if the tool is present
If the tool is not present the menu action is disabled.
Also add a link to the Qt Creator cmake-format documentation.

Fixes: QTCREATORBUG-29415
Change-Id: I4afb33f0d5ce08975b0964d6bee80dfb41cfcde5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-08-29 13:29:13 +00:00
Marcus Tillmanns
373886bc21 ProcessStub: Fix start sequencing
An application that is using ptrace will send SIGTRAP as soon as it
reaches its execve call.

The process stub previously expected the only signal sent from the
inferior to be SIGSTOP due to the PTRACE_DETACH call with the
SIGSTOP argument.

This meant that a race could occur where the SIGTRAP was received
instead of the SIGSTOP and so the PTRACE_DETACH did not actually
detach correctly.

This patch fixes it so that it first waits for the SIGTRAP and then calls
detach and waits for the expected SIGSTOP.

Should this fail, more debug output is added to ease debugging failures.

Fixes: QTCREATORBUG-29463
Change-Id: Ibac8b75de0c5604aeb20faba8aff58633329341e
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-08-29 13:25:08 +00:00
Mahmoud Badri
203f38d616 QmlDesigner: Allow hiding UrlChooser's cog
Change-Id: I5b9b3b3d658031c4db6f0d61627e7d5218b1afc0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-29 13:13:10 +00:00
hjk
52d1cd47cb Utils: Write Key/Store to settings
We claim that we still store QVariantMap to keep the format unchanged.

Change-Id: Ie7b0a83febfeb2cb3cfc9ee42b8423453cf3b1c4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-29 12:28:57 +00:00
hjk
e5afe02556 Utils: Register Key/Store related metatypes
Change-Id: If7b0a83febfeb2cb3cfc9ee42b8423453cf3b1c4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-29 12:16:59 +00:00
hjk
4c81af8c0a QbsProjectManager: Create QbsProfileManager on request
Task-number: QTCREATORBUG-29546
Change-Id: Ib50ce8cacb4ef26346d0b43401f97093c1c75155
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-08-29 12:09:50 +00:00
Mahmoud Badri
51e31314c9 QmlDesigner: Add the snapping icons to C++ side
Change-Id: Ia09472834fcd2db876c7bb527fe23f1f59fa36bf
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-08-29 11:54:25 +00:00
Mahmoud Badri
451327ba43 QmlDesigner: Add snapping icons to the icon font
Change-Id: I6e5547ed5170b9c750efefb52407df3a4eb783e0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-08-29 10:49:32 +00:00
Eike Ziller
da7c25e8da CMake: Do not print warning if no run device is set
With an iOS kit, there is no run device set if no device is connected,
which triggered an assert.

Change-Id: I9c435c618daab2601973372efb84f9ddbe9c5998
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-08-29 10:38:12 +00:00
Mahmoud Badri
9ecaa16074 QmlDesigner: Allow hiding ColorEditor's cog
Change-Id: Ibaff58441e88c2030c272974b96b08e8b5b9dd3d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-08-29 09:49:00 +00:00
Artem Sokolovskii
12fb4e93bd Python: Fix debugger start
Change-Id: I9a26c591d174f5f079c4a673a6bf1aedd5cd709c
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-08-29 09:11:33 +00:00
Amr Essam
2d99b07907 QmlDesigner: Add conversion functionality for uniforms and shaders
This includes qml and shader types and properties

Task-number: QDS-10499
Change-Id: I3a81ceb3a9e55280545e3ed498fb1ba0433a58fd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-08-29 09:10:13 +00:00
David Schulz
4451da7037 LanguageClient: use json editor in language client settings
Change-Id: Ib2b8dae730a701d71ae39a4eaf401f5feab7f921
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-08-29 08:12:58 +00:00
David Schulz
201f5291eb TextEditor: add json auto completer
Change-Id: If502ccb3b75d3c5a5d7ae555acfeb51644ffcd71
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-08-29 08:12:51 +00:00
Jarek Kobus
36316e2d17 JsonEditor: Fix warning about unused argument
Amends ddb4aa0151

Change-Id: I722b5615bec11796a9a003b288ced8d0da7b1d4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-08-29 07:48:46 +00:00
hjk
b0d78aefff ProjectExplorer: More Store/Key in KitAspect
Change-Id: I6b6e497fac7a3d0f041af727601428bb5c3c441d
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-29 07:47:03 +00:00
Jarek Kobus
e4ab99990e DebuggerPlugin: Fix assert on Creator startup
Add toolbar action to the perspective before calling
setToolButtonStyle(), otherwise the m_toolButton isn't
created yet and the assert is triggered.

Amends d304e82e63

Change-Id: Idac207464d8844565c96718ac65a7b820f05d4b7
Reviewed-by: hjk <hjk@qt.io>
2023-08-29 07:42:59 +00:00
The Qt Project
47c2d78b6c Merge "Merge remote-tracking branch 'origin/11.0'" 2023-08-29 07:10:26 +00:00
hjk
6c5027ba0e Utils: Move storefrommap.h to store.cpp
Will be used more widely.

Change-Id: I77bb7760e7b3bd1147ea1e1d6be196ef75f691a2
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-08-29 06:54:31 +00:00
Eike Ziller
a3ef2a6d00 Merge remote-tracking branch 'origin/11.0'
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: Ie831644eb1c69beed6791cbc67cbfb9309dcd351
2023-08-29 08:47:29 +02:00