Commit Graph

85691 Commits

Author SHA1 Message Date
Christian Stenger
bd849b615e QbsPM: Fix qbs build
Amends ba249a3514.

Change-Id: Ieda665923434510ab5fe6b17776dbac07262d2a8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-27 14:36:43 +00:00
Marcus Tillmanns
f98934ef73 Core: Simplify ActionManager::setOnTriggered
Allows the same functionality as QObject::connect

Change-Id: I4416d991dc8bcdf24893435c30b530a6b4d3fda4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-27 14:27:53 +00:00
Jarek Kobus
b26d7b0f48 RemoteLinux: Preserve TransferMethod setting
Change-Id: I265831c4a552caa258417952bd418a284734fd4b
Reviewed-by: hjk <hjk@qt.io>
2023-11-27 14:15:31 +00:00
Marcus Tillmanns
1079204a3e Utils: Fix updating BoolAspect::action() checked state
Task-number: QTCREATORBUG-29949
Change-Id: I1c12bd59855ecf13f06fdb16bf8e0937768527b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-27 14:06:11 +00:00
Tim Jenssen
0c3c17c53a Build/deploy: fix missing argument
Change-Id: Ia73cfac75d336d7e321aef4059bb0eb6e4e3ed31
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-27 13:46:31 +00:00
Tim Jenssen
60d23bff03 CMake: make sure that deploy.py errors get caught
Change-Id: I05f818145ed29f4521bddc36051ae504c13278d7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-27 13:45:16 +00:00
hjk
3bbda8f9da ProjectExplorer: Rename Tool{C,c}hainKitAspect
Change-Id: I74460b6402ab00f972c208023f03fac617982a11
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-27 13:35:28 +00:00
Christian Kandeler
ba249a3514 QbsProjectManager: Add a language client
... and use it to follow symbols that QmlJSEditor does not know about.
For now, the only implemented case on the server side is getting to a
product or module via a Depends item.
More functionality will follow.

Change-Id: I597c7ab10f4bf6962684ed26357dfc0eef3a6c15
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-27 13:00:36 +00:00
Christian Kandeler
41ac635ca6 ProjectExplorer: Fix restoring kits data
Another fallout of Utils::Store.

Fixes: QTCREATORBUG-29970
Change-Id: I2b696b83980c451d5312ac8a874d9f3dc86361c9
Reviewed-by: hjk <hjk@qt.io>
2023-11-27 11:51:26 +00:00
The Qt Project
32ed2cb9c7 Merge "Merge remote-tracking branch 'origin/12.0'" 2023-11-27 11:48:19 +00:00
Marcus Tillmanns
2da12ddc60 Terminal: Add select all action
Fixes: QTCREATORBUG-29922
Change-Id: I565f2f9f570610e1bb7f528cd874a0dd9c47dbe8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-27 11:32:01 +00:00
Cristian Adam
cdee6e263d README: Fix markdown rendering in Qt Creator
The <> break the rendering and looks weird.

Change-Id: Ib3ce7763127623d1ac0bbd0c133b71b7ef41fd29
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-27 11:24:22 +00:00
Eike Ziller
f9fb628ee3 Merge remote-tracking branch 'origin/12.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/cppeditor/cppeditorwidget.cpp

Change-Id: I618826eaea8acfa65148bd191a0263454bf50e43
2023-11-27 11:47:53 +01:00
Tor Arne Vestbø
d7545f9bf5 Prevent lldb from enabling os_log mirroring to stderr
lldb will normally set OS_ACTIVITY_DT_MODE, so that NSLog is mirrored
to stderr, but this also affects os_log, which we use in the Apple
unified logging backend.

When we detect this situation in the unified logging backend, we disable
Qt's own stderr logging, to avoid duplicate messages.

As the Qt stderr logging is preferable to the stderr logging that os_log
gives, we override lldb's choice, using the same environment variable
opt out that Xcode uses: IDE_DISABLED_OS_ACTIVITY_DT_MODE.

This makes console output in Qt Creator the same, regardless of whether
the user is debugging the app or not.

Change-Id: I5544bde803671258cede918705388c9283885e30
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-27 09:58:56 +00:00
Christian Kandeler
61e9a7fe16 CppEditor: Fix comment conversion for indented comments
Due to accidentally overlapping removal/replace operations, it could
happen that we lost actual content when trying to remove whitespace.
Amends f93836b25d.

Change-Id: I7a624e78cf0986ee9818d47ea0812c6632426a24
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-27 09:57:52 +00:00
Eike Ziller
c3907bf781 Bump version to 12.0.1
Change-Id: Iac214602e3bfef975c8e4083ba251a652ed1ebc7
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-27 09:05:16 +00:00
Eike Ziller
b76c054961 Widget Designer: Hide the toggle action for the central widget
It doesn't really make sense to toggle the central widget (= form
editor) for widget designer

Change-Id: I6ebcc9e1c2a57f1377c16a791b27b44f081042c3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-27 08:33:28 +00:00
Eike Ziller
7c72952967 FancyMainWindow: Improve positioning of docks when (un)collapsing
This is not foolproof, but we try to find the dock widgets that are
vertically arranged with the one that is (un)collapsed, and try to set
the sizes such that the title widget does not move.

Change-Id: I14fd799396a41420b041a89d43fd65d47672a831
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-27 08:33:20 +00:00
Eike Ziller
22f5ec4c87 Widget Designer: Adapt after dock widget redesign
Before the redesign, the dock widgets didn't have a "tool bar" at the
top, so we had the designer tool bar with the document dropdown and form
related tool buttons spanning the whole design mode width (to have a
continuous styled bar at the top of the window).

Now the dock widgets' title widget is a styled bar, so we would have the
designer tool bar, and below that the styled bar from the dock widgets,
which unnecessarily creates a big blog of styled bars.

Instead, move the designer tool bar inside the central form widget. The
title bars from the dock widgets complete the top styled bar now. This
is also more consistent with Edit mode.

Change-Id: I7d322a75a8a34120763b4dd85c44ddf674930e36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-27 08:32:26 +00:00
Tim Jenssen
ec59bab491 QmlDesigner: correct JavaScript name
Task-number: QDS-10810
Change-Id: I74c97600fd6284743eb06afcbf4d93d0f6c67633
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-27 08:05:13 +00:00
Ali Kianian
24968dbabd QmlDesigner: Update DataStore.qml when collections change
Task-number: QDS-11113
Change-Id: I27d49d40a36a22e9af447087e7e8f7995812f1e3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-24 20:14:54 +00:00
Cristian Adam
73ddecd723 Scripts: Update compression algorithm for makedmg
bzip2 has been marked as deprecated by hdutil.

Change-Id: I647f1895c6b0d6456806d2ce3768fabcfdcfabc3
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>
2023-11-24 18:07:36 +00:00
Tim Jenssen
f6b5afa8e4 Cmake: DS does not want automatic detection of cmake help file
Task-number: QDS-9780
Change-Id: I006b27ee21a910f6d5095f09406b0f4e95a62c35
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 17:48:58 +00:00
Aleksei German
37228f6da6 QmlDesigner: Fix Connections for items without ids
Task-number: QDS-7711
Change-Id: Ie686a7a456dd8cee57d63480913cd6f636af3e91
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-24 17:21:16 +00:00
Tim Jenssen
49d3e6fddc qds: add Qt Shade Baker binary
Task-number: QDS-11387
Change-Id: Ibea4c241fcaaecffc7f3a29b8fc68fda442c5104
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 16:16:57 +00:00
Henning Gruendl
e16a302a43 ADS: Integrate newest base repository commits
* Update to newest version of ADS
* Fix memory leak in DockContainerWidget

Base repository was merged until commit
59b4dfb89c0c9c0e6035fe580088432312ed2d09

Change-Id: I357b21888fe6f0ec2160c8688d84cb7ecdcad079
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-11-24 16:16:00 +00:00
Henning Gruendl
d0fccdc025 QmlDesigner: Fix signal name prefix removal
Only remove the first to characters of a signal name, if it matches
the regular expression.

Task-number: QDS-11385
Change-Id: Icc61f2c5281c15842729f67d3b0498c80637ceb1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-24 16:14:12 +00:00
Aleksei German
fceb1a2e63 QmlDesigner: Fix Kit selector for MCU projects
Task-number: QDS-10337
Change-Id: I896eb826d75fd9ee08e083d45b8f7180abf53c37
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-11-24 15:26:28 +00:00
hjk
c28fb1fdbe ProjectExplorer: Rename ToolChain to Toolchain
Change-Id: Ibb520f14ff3e2a6147ca5d419b9351c50c141063
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-24 15:18:24 +00:00
hjk
2d4867e73f ProjectExplorer: Rename Tool{C,h}ainFactory
Also adapt derived classes.

Change-Id: Iebf654c974730333c42b6994269ad1a4d5f7f428
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-24 13:55:25 +00:00
Eike Ziller
39b0989050 Sqlite: Fix missing include file in dev package
sqliteexception.h:6:10: fatal error: sqlite3_fwd.h: No such file or directory

Amends eed303450d

Change-Id: I350246e223bd80129b1fb29e8b2b57953536b5c7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-24 13:50:12 +00:00
Henning Gruendl
d9671c62d9 ADS: Fix switch enum not handled warning
Change-Id: I7b9dd5f5cf3dde535aa099a9a64203060174123e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 13:47:26 +00:00
Miikka Heikkinen
e1d450bcaf EffectMaker: Don't allow saving with pressing enter if save is disabled
Fixes: QDS-11392
Change-Id: Ia600489b39d58a0224f17856f9ab6e2110faee82
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-24 13:40:37 +00:00
Henning Gruendl
9affb29ddb ADS: Fix FocusHighlighting when dragging tab
Task-number: QDS-11172
Change-Id: Ibb159bb39a3e15797b468302c38531188e928ae9
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-11-24 13:36:35 +00:00
Henning Gruendl
b5da50338e ADS: Prevent saving not displayed workspace
Prevent saving a workspace that was never shown, e.g. only welcome page
was shown and QtDS was closed again. This scenario causes the workspace
to have wrong sizes hence the next time this workspace will be shown
it will look distorted.
This behavior is a result of the startup workspace always being loaded
and always saved. If the workspace was never visually shown, it didn't
get the correct geometry from the main window which results in wrong
sizes of splitters in the workspace.

Change-Id: I780b561e98e72f7d48becf32d178fb600b5d4336
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 13:36:10 +00:00
Henning Gruendl
66bda77d43 QmlDesigner: Make minimumSizeHint setting passive
Remove the connection to the minimum size hint setting and the active
call to the dock manager and force the user to restart design studio to
apply changes.

Change-Id: I2aca66b02a1f7658a2dac7322f6a530bf9f6b084
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-24 13:35:57 +00:00
Christian Kandeler
badc0b4ea5 CPlusPlus: Fix parser crash
The parseCompoundStatement() function can return without setting the
output parameter if the maximum statement depth is exceeded.

Task-number: QTCREATORBUG-29847
Change-Id: Ifd76cd948c30498863246a1b80bd0657950101ca
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-24 13:30:43 +00:00
hjk
2ef1ed9c22 ProjectExplorer: Rename Tool{C,c}hainConfigWidget
That's the trend.

Change-Id: I24a328f1190200b4499c6a11d9d3df074ce5973d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-24 13:17:42 +00:00
Christian Kandeler
e2c1d12a05 CppEditor: Fix "SelectBlockUp" for string literals
Literal::size() is the number of chars used internally, not necessarily
the number of logical characters.

Fixes: QTCREATORBUG-29844
Change-Id: I74431a2f3f533482567c3774f09deb44dc83d9f0
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-24 12:57:28 +00:00
Christian Kandeler
78329318f3 Update qbs submodule to HEAD of 2.2 branch
Change-Id: I9a816a352917fd411b0fc07d4090be195790b06f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-24 12:25:06 +00:00
Christian Kandeler
462079f806 CppEditor: Fix renaming virtual functions
Before renaming, we first follow the symbol to see whether it originates
from a generated files. We must not try to list the overrides for virtual
member functions in that context.
Amends 06390f5b53.

Change-Id: Ic17e865a03b884d63875622f54448fef63c24b7e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-24 12:24:28 +00:00
Thomas Hartmann
e2c1cfb69f QmlDesigner: Add wizard data for models and backend json data
Added the new files to all wizards, since the change of the
qmldir file otherwise breaks the wizard.
Adding json files to qmlproject for cmake generation.
New files have to be added to cmakefiles.txt.

Change-Id: If00eb4507b6f1364ce3cfa00db39632635febd09
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-24 11:49:23 +00:00
Miikka Heikkinen
ac3a4b71e6 EffectMaker: Bake preview shaders using correct version of qsb tool
If the target kit Qt version differs from Qt version that QDS was built
with, there is a chance that shaders baked for the target kit don't
work for rendering preview on QDS side, if QShader version has changed
between the two Qt versions. This means we must bake separate shaders
for the preview and the project to use, each using the correct version
of qsb tool.

Task-number: QDS-11361
Change-Id: I44df2aeb3f4d6aa4b80e3be052d46735d96c53ef
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-24 11:47:29 +00:00
Eike Ziller
b2def1b949 QmlDesigner: Hot fix for settings crash
Change-Id: I05d27fb2dee65c50191e7dcd7c7bf8f195bb46e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-24 11:06:16 +00:00
Eike Ziller
2a331567f6 ExtensionSystem: Check for duplicate plugins
If there are multiple plugins with the same name, do not load any of
them, mark them with error.

Fixes: QTCREATORBUG-26221
Change-Id: Id433a66203294b8302294eb09665043452e45ded
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-24 10:54:12 +00:00
hjk
9b2cbe9b71 Android: New setup for AndroidDeviceManager
Also remove the now-unneeded plugin pimpl.

Change-Id: I37eaa91a2756e823d07323b54695e19860cb16ab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-24 10:26:01 +00:00
hjk
353c3cc930 Android: Use new setup for more plugin items
Change-Id: Id5ff09813ab7b4be425d007abd4cc04d9c9472c1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-24 10:25:51 +00:00
hjk
497b9b3c2c Android: Use new setup for a few factories
Change-Id: I4538a2839b995f7bc245ae1a91f1979cc8c0dfdc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-24 10:20:42 +00:00
Jarek Kobus
0d12bbf432 ProjectExplorer: Remove unused member
Change-Id: Ie7096da33d211f55d3ba37a5b685f5fb8ba89f23
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-24 09:28:02 +00:00
Eike Ziller
9698ae50c5 Merge remote-tracking branch 'origin/12.0'
Conflicts:
	src/plugins/valgrind/xmlprotocol/parser.cpp

Change-Id: I905a5c4f7334f733e99359fbfccd1572b4007696
2023-11-24 10:07:10 +01:00