Commit Graph

68765 Commits

Author SHA1 Message Date
Christian Kandeler
81c39da7d0 Update qbs submodule to HEAD of 2.2 branch
Change-Id: Ief8758531017292fd87ac93a9653dc73b3ccbd3e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-12-01 10:49:14 +00:00
Ali Kianian
4129c7703b QmlDesigner: Add DataStore Dynamically to the project
Task-number: QDS-11400
Change-Id: I0ad20a6aad604aa66d4d0f24ca32a19fb9e94a08
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-30 11:50:48 +00:00
Mahmoud Badri
1423740e09 QmlDesigner: Add save icon to the icon font
Change-Id: Ic88f61f19142a42cc456cb85f836ea9ed5635c07
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-30 09:51:09 +00:00
Ali Kianian
206ad75359 QmlDesigner: Assign a single collection model to the selected node
Task-number: QDS-11217
Change-Id: I35eb536540faa2299a51d152a29f07c2c36abe41
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-29 14:11:26 +00:00
Eike Ziller
3b6dc15e04 Fix that target selector accumulated labels again
It was previously fixed in  1a43983ea6

Since then, adding the aspect to grid adds a label itself, so the self-
created label in setKit is irrelevant (it adds some empty space), and
the labels that are created for the aspects are accumulated again.

Instead of trying to delete the labels, create a wrapping QWidget.
Deleting this widget gets rid of any widgets that might have been added
when creating the grid of mutable aspects.

Fixes: QTCREATORBUG-29990
Change-Id: I5f2aebf9a865e532c9e24a29ec5979b11d17d43a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-29 13:28:26 +00:00
Christian Kandeler
c20129a973 ClangCodeModel: Make VirtualFunctionAssistProcessor more safe
Let's not access the object state after emitting
ClangdFollowSymbol::done(), in case the receiver deletes us.
Can happen in test code.

Change-Id: Ia6c691c0f88b16476da1a6be1cedd106d9da2d53
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-29 09:48:30 +00:00
Christian Kandeler
6ed456ed9e ClangCodeModel: Fix check for strings that look like file paths
Backslashes in the markup string are escaped with another backslash, so
we need to check for two consecutive ones on Windows.
Otherwise, qdoc/doxygen commands such as "\note" are interpreted as files
and trigger expensive I/O operations.

Fixes: QTCREATORBUG-29975
Change-Id: I822f57a8612274ff4112063928cab21b9d7ca792
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-29 09:47:46 +00:00
Thomas Hartmann
fa376883f0 QmlJSCheck: Ensure that ::createObjectsForImport always works correctly
If ::createObjectsForImport is called twice, then
m_objectsByQualifiedName already contains the type and an empty list is
returned. The returned list is used for the prototype lookup and
in this case the import is empty and the prototype cannot be found.
This happened for QtQuick3D.Effect when used from QtQuick3D.Effects in some
cases. There is a race condition. The second call to ::::createObjectsForImport
is quite rare.

Task-number: QDS-11069
Change-Id: I6dfe152224172d0d626625d24a53f36d4219372f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-28 15:52:49 +00:00
Alessandro Portale
a71b33944b Core: Restore opening of files that are dropped on the MainWindow
The code to handle dropping unintentionally got commented out, then
fixed, then commented out again.

This change restores it.

Amends: e5f74d217b
..which amended: 5da1f14903
..which amended: e34762c844

Fixes: QTCREATORBUG-29961
Change-Id: Iccc8a9b7bc24bc3475ed4fa37a7c231a1f575c1c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-28 14:03:21 +00:00
Marcus Tillmanns
a27aceb558 CompilerExplorer: Add user-agent
Change-Id: Ia2193a1cf9bd0b3542313162d6befe14649efe97
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-11-28 13:17:09 +00:00
Samuli Piippo
ed4dadfcc1 boot2qt: use DirectUploadStep on Windows
GenericUploadStep doesn't set execute rights to the binary when
deployed from Windows host. Switch back to DirectUploadStep
until support is available.

Task-number: QTCREATORBUG-29971
Change-Id: I253210d44c5587d529f1f7082cac3e9a2ead59c1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-28 11:54:28 +00:00
Jarek Kobus
0f8a057bea Valgrind: Fix stopping the Valgrind process
Fixes: QTCREATORBUG-29948
Change-Id: Idb7f113bee6706283c7fdea66d9f9dfccbd6cdb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-11-27 15:18:14 +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
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
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
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
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
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
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
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
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
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
Christian Stenger
5841e95123 Valgrind: Fix accessing empty optional
Change-Id: I3d4d8ed9b919a6c0eb8d5530c9d8e2723a8cc1ae
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-11-24 07:50:28 +00:00
Aleksei German
71394691b5 QmlDesigner: Fix for MCUs styles combobox
Task-number: QDS-11258
Change-Id: Ib1399e111daf14856e3e679619978180ba7da088
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-23 11:05:51 +00:00
Mahmoud Badri
c14dc9d2ba EffectMaker: Focus view upon open, and correctly open new effects
Also don't open old effect maker when creating a new effect

Fixes: QDS-11359
Fixes: QDS-11364
Change-Id: Ie9659af991f10cafac29dc53cbe7163eb8995b2a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-23 10:36:17 +00:00
Orgad Shaneh
0da6fe6890 CppEditor: Pass function by reference
Coverity-Id: 1572606
Change-Id: Ia25fe956ebace7e77412971d7834ce63f236f729
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-23 09:29:40 +00:00
Christian Stenger
27055e4c39 CPlusPlus: Fix compile before Qt6.5
Amends 7475b073fb.

Change-Id: I59494fe485cdb40b3af089698edc895dc2dd4519
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-22 05:49:46 +00:00
Aleksei German
1ed6674d1e QmlDesigner: Fix crash in QmlDesigner::TextEditor
Change-Id: Ic511e5812bbe015f90f88f947faa50bb3461ae38
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 17:34:53 +00:00
Henning Gruendl
f2eee58e00 ADS: Set default minimum size on empty dock widget
* Set a default minimum size on empty dock widgets. Dock widgets are
  empty if their content minimum size isEmpty (width or height <= 0)
* Replace 0 with nullptr as return value
* Fix some code formatting

Task-number: QDS-11255
Change-Id: Ifa7320fd57e73367f71087232dedd939d19ae490
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 17:34:06 +00:00
Christian Kandeler
7475b073fb CPlusPlus: Fix finding end of raw string literal
The employed algorithm lacked proper backtracking, potentially causing us
to miss the delimiter altogether.

Change-Id: I7993c3c27d034925bd884e192779c85c54be9ec4
Reviewed-by: hjk <hjk@qt.io>
2023-11-21 16:00:09 +00:00
Tim Jenssen
cdb6a5f291 Merge remote-tracking branch 'origin/12.0' into qds/dev
Change-Id: I6adb244f39b7d13377cdf377e95d11415603f8ac
2023-11-21 15:58:17 +00:00
Sivert Krøvel
b298c981f8 Revert "McuSuport: Use qsTrId() instead of qsTr in QtMCUs templates"
The id based translation feature is not available on Qt for MCUs 2.5

This reverts commit 8f948c28a9.

Task-number: QTCREATORBUG-29940
Change-Id: I0a63e8738e2a0b92319ba53d8b1f1730f8421796
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
2023-11-21 15:18:33 +00:00
Yasser Grimes
d08bb59faf McuSupport: Reset invalid packages to default on update
When updating kits some packages will still have the cached value of the
outdated package resulting in failure on updated. although default paths
would have given the correct path.

This patch restore package values to the default value, in addition to
tracking changes in model-names that correspond to the same kit.

Fixes: QTCREATORBUG-29855
Change-Id: Iad52df93e1e39c7f56bdb30036ac21cda8cdf670
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 15:15:58 +00:00
David Schulz
06595222ff Python: fix commercial pyside installation
Change-Id: I6a89b9a9f32e07db91e67df248d94c78ae731455
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-21 14:03:13 +00:00
Miikka Heikkinen
fc456a74d4 EffectMaker: Fix crash after opening saved effect when nodes exist
Clear and removeAllNodes functions were consolidated into one clear()
function, which now properly resets the entire model. This makes UI
properly synced to actual model state when composition is opened, so
the phantom nodes will no longer appear.

Fixes: QDS-11347
Change-Id: I204760cca6af669daa43a18bfb199dfbf14b73cb
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-21 13:59:04 +00:00
Christian Stenger
9c07e7ea7c PE: Close generated files silently if they have an editor
Omits the original request whether to save a modified file
if the files are opened inside QC, but it ensures to format
the correct file content instead of using some cached
content.

Fixes: QTCREATORBUG-29904
Change-Id: I3b3f3e53fb811288a208376559243bea01d0d4a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:58:49 +00:00
Christian Stenger
7125862212 Add some include guards
Change-Id: If306f95f206e2b1cba48df806c822b8e2d27cf72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-21 13:58:36 +00:00
Tim Jenssen
701d4b2146 QmlDesigner: fix crash
Task-number: QDS-11300
Change-Id: I1fe6966445284e3e9ca5596d8f5ec866f37acc39
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-21 13:51:56 +00:00
David Schulz
72a8e2e644 Python: fix pdb debugging
The pdb engine is created in the DebuggerRunTool constructor so we
cannot unconditionally overwrite the engine in DebuggerRunTool::start.

Amends 9af8ecd935

Change-Id: I0c3c88d14235bfb01543da788a7bb5e7e99018d3
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
2023-11-21 13:43:24 +00:00