Commit Graph

2612 Commits

Author SHA1 Message Date
Burak Hancerli
99fcb5c14b QmlPuppet: Fix the debug messages
Change-Id: I2b1d969a665863232a8d60a943fce87b6bb4dd3c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-05-10 13:38:41 +00:00
Miikka Heikkinen
3f48d2bb7e QmlDesigner: Use SceneEnvironment background by default
"Use Scene Environment" is not default option for 3D view background.

Fixes: QDS-12414
Change-Id: I5981b5d77a044c5f2d250c5c1ccdf307a7764108
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-03 12:43:16 +00:00
Miikka Heikkinen
d9e4a205d2 QmlDesigner: Fix IconGizmo multiselection
Clicked signal was directly connected to handleObjectClicked function,
but it had different number of parameters, leading to multiselection
parameter to always being undefined.

Fixes: QDS-8137
Change-Id: If065531878df9ad7e6584c89dce19b6b7d71a676
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-05-03 10:53:16 +00:00
Miikka Heikkinen
6cec311c5d QmlDesigner: Fix url property path resolving
Converting file:// urls to relative paths assumed that the file://
url would always point to a file that is in same or child folder of
the qml document, which broke for urls that pointed under generated
components folder.

Fixes: QDS-12029
Change-Id: I352ba01650ebf6c1c5fedef9323bf27b44491736
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Shrief Gabr <shrief.gabr@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-05-03 09:31:47 +00:00
Miikka Heikkinen
39fed3759c QmlDesigner: Show crosshair only after there is a move in fly mode
Fixes: QDS-12596
Change-Id: Id34ad1b0745814a5b3dee8b6c3001d19ca7f4118
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-03 08:38:58 +00:00
Miikka Heikkinen
cb0e28d2e6 QmlDesigner: Start requested timer when it's created in 3D view
Fixes: QDS-12659
Change-Id: I78f5854185e4efebc00ea63c5dd290dc851e21eb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-05-03 08:38:50 +00:00
Miikka Heikkinen
7a9a30d68c QmlDesigner: Add reflection probe icon gizmo
Fixes: QDS-11964
Change-Id: I35fce676c282988e7faa1376da90e4cd53f353ae
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-29 13:33:13 +00:00
Miikka Heikkinen
1cf6e7844a QmlDesigner: Change wheel to adjust camera speed in fly mode in 3D view
Mouse wheel no longer zooms 3D view when done in fly mode. Instead,
it adjusts the camera speed value.

Fixes: QDS-12291
Change-Id: I0bb5960d67cb25d545d3ac2ce2567c75f057ea72
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-26 13:01:54 +00:00
Miikka Heikkinen
97b646e30a QmlDesigner: Fix typo in approachObject
Fixes: QDS-12616
Change-Id: Ib73c10dfc2806df2f98083019d67a78a6bb44a0f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-26 12:02:53 +00:00
Miikka Heikkinen
dc35a7fd3a QmlDesigner: Add Shift and Alt modifiers to fly mode
While in fly mode, Shift will speed up the WASD/QE movement by 100% and
Alt will slow it down 50%.

Also changed how shortcuts are disabled in fly mode. ShortcutOverride
events are now used to suppress conflicting shortcuts, which has the
advantage over old method as it will also suppress application global
shortcuts (such as Alt key moving focus to application menu).

Task-number: QDS-12291
Change-Id: I5c97d10b6f8955f3b3214e8e254a80cae7357ce5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-25 12:30:54 +00:00
Tim Jenssen
72f82f420a Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I8a8692100cbd2429d1952009b73f29d8a374f9bd
2024-04-24 17:37:48 +02:00
Christian Stenger
b63b8c2526 Tools: Silence soft assert on Windows
Change-Id: Icb10257505efec73b4184ec190c514ec169ec2e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2024-04-24 05:30:15 +00:00
Tim Jenssen
ef0ee52bf9 Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
	doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
	src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I3683c1799df05209d05413383456b285a2daf96e
2024-04-23 16:05:55 +02:00
Miikka Heikkinen
c351e8c9c7 QmlDesigner: Fix picking 3D models from 2D view
Adding new nodes to the scene for some reason doesn't include them
to the full window render done for picking purposes. Changed the render
to be done via grabItem() on the target View3D instead, which seems to
work more reliably.

Fixes: QDS-12577
Change-Id: Ia5f01b9521fd898f8cf073f96d32fc31bf936a37
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-23 14:04:25 +00:00
Miikka Heikkinen
5a49c16694 QmlDesigner: Use space key to move close to object at crosshairs
When in fly mode in 3D view, crosshairs are shown in the middle
of the active split. Pressing space in fly mode when there is
a model at the crosshairs will move the camera close to the
model.

Fixes: QDS-12292
Change-Id: Id15c13458af3763f4e0712614cf9cf3ed695fb5d
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-19 14:52:05 +00:00
Miikka Heikkinen
2cd9efee63 QmlDesigner: Fix changing dynamic properties on root material object
Changing dynamic properties on a CustomMaterial root object didn't
trigger rendering. Also there were duplicate of the property generated
when it was changed, which made quick3d side ignore the property change.

Fixes: QDS-12469
Change-Id: Ia83eaa76fd4f43428a01baea9a3491a8917aa30d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-19 10:12:32 +00:00
Miikka Heikkinen
a95ee86ad2 QmlDesigner: Reset zoom when aligning view to camera
Resetting the zoom after aligning edit camera to scene camera avoids
confusing behavior in some cases, primarily when the alignment is
triggered from outside 3D view.

Fixes: QDS-12348
Fixes: QDS-12350
Change-Id: Ic0c076ea3dff3f1be5f57e20c0dbbe6069867b51
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-04-18 13:38:57 +00:00
Miikka Heikkinen
401bbae862 QmlDesigner: Remove zoom level from affecting edit camera movement
When moving the edit camera with keyboard, zoom level no longer is
used as multiplier for the movement.

Fixes: QDS-12274
Change-Id: I59c903b73fef095e619cccc36868605b47f9ec83
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-04-15 10:01:29 +00:00
Thomas Hartmann
c9f9804edf QmlDesigner: Fix getting the bounding rectangle for an effect
When getting the bounding rect for an effect we actually have
to find the item with the effect first.

Change-Id: I4e20f77c6b8dca9d58ccffb42d8b803f57317cb9
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-04-12 15:39:49 +00:00
Thomas Hartmann
8a21dc325c QmlDesigner: Fix DesignerEffects rendering
The property name changed and we adda bit more padding.

Change-Id: I9432f3d5a053d38feb32649be52a99696a9f3b6c
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2024-04-12 15:39:41 +00:00
Tim Jenssen
912082e6a8 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I1f6114244514a2b786a8b0d364a303b925ad7757
2024-04-10 17:30:10 +02:00
Ahmad Samir
6babc022d5 Adpat to changes in QAbstractFileEngine/Iterator in qtbase
- Replace hasNext()/next() with a `bool advance()` method
- Replace QAFE::FileTime with QFile::FileTime, they are identical
- QAFE methods now return std::unique_ptr, which matches reality as call
  sites stored the pointers in a std::unique_ptr anyway

FileIteratorWrapper:
State::BaseIteratorEnd is only needed when using hasNext()/next(),
hasNext() changes m_status to State::BaseIteratorEnd, then next() checks
that and changes m_status to State::Ended; this isn't needed with
advance() since it's only one method.

Change-Id: I4414f334715237a2fc13ace6f4733d975e2cfaa3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
(cherry picked from commit ba3f0bc841)
2024-04-08 11:34:27 +00:00
Thomas Hartmann
ff4e33dc0a QmlDesigner: Enable rendering of DesignerEffects
* Effects are items and we have to use __effect/source and allEffects
  to idenfify them and get the correct bounding rectangle.
* For now we use a custom parser to work around issues when editig the model

Change-Id: I78690498c44f8285d3bb6ce78eafcafb9c26b2f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-28 08:26:59 +00:00
Tim Jenssen
8a18423175 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I28e2e8cacf9a20c8b2f5073f4a492862d814fb99
2024-03-26 15:59:34 +01:00
Miikka Heikkinen
5f055fed2d QmlDesigner: Render effected items with extra margin correctly
Replaced old hardcoding of 40px margin for effects with actual
sourceRect of the layer. Also check for effect first before clip, as
that clip doesn't actually affect the clipped item itself,
it only affects the children of the clipped item.

Fixes: QDS-12303
Change-Id: Ia962c74cdefb16ed17bea34f0fc50649256d78fe
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-22 13:18:43 +00:00
Eike Ziller
90e1d96019 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb
2024-03-20 15:05:58 +01:00
Alessandro Portale
1b408947b0 Welcome: Design update round #2
User feedback was gathered and in part implemented in form of a design
update. Smaller fonts, icons and gaps in the projects/sessions screen
and in the examples tiles.

Change-Id: I69d0d9ae21ba855feceeb77d620aa5b556377808
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2024-03-19 18:33:11 +00:00
Thomas Hartmann
d114074afd QmlDesigner: Workaround issues with QJSValue in Qt 6.7.x
This forks code from Qt to fix an issue with JSValue.
We must skip QJSValues when iterating properties
since copying or constructing the QVariant crashes.

Task-number: QDS-12263
Change-Id: I8db701cee94dccd7fe254c9473dc25b87f8a04f8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-03-19 16:37:40 +00:00
Miikka Heikkinen
dd31886649 QmlDesigner: Fix fly mode camera rotation direction
Flip x-rotation direction when camera is upside down to keep camera
rotation natural.

Fixes: QDS-12186
Change-Id: Ia9f166cafa27a09a4dd5a72dbb8ec28f00239564
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-19 09:23:43 +00:00
Ahmad Samir
ba3f0bc841 Adpat to changes in QAbstractFileEngine/Iterator in qtbase
- Replace hasNext()/next() with a `bool advance()` method
- Replace QAFE::FileTime with QFile::FileTime, they are identical
- QAFE methods now return std::unique_ptr, which matches reality as call
  sites stored the pointers in a std::unique_ptr anyway

FileIteratorWrapper:
State::BaseIteratorEnd is only needed when using hasNext()/next(),
hasNext() changes m_status to State::BaseIteratorEnd, then next() checks
that and changes m_status to State::Ended; this isn't needed with
advance() since it's only one method.

Change-Id: I4414f334715237a2fc13ace6f4733d975e2cfaa3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-03-18 13:15:14 +00:00
Tim Jenssen
9ce7aaccc5 Merge remote-tracking branch 'origin/qds/dev' into HEAD
Change-Id: I9d13aa050b1c7fb0954e2b63d13da2922d8f7218
2024-03-14 16:13:25 +01:00
Miikka Heikkinen
5a85490d4c QmlDesigner: Add 3D edit camera speed configuration dialog
Edit camera speed configuration consists of a slider and a multiplier,
which combine into the total camera speed.

Speed and multiplier are stored per scene.

Fixes: QDS-12187
Change-Id: I587c04cf80d1ca95b5a38c406158e46cdb91d06f
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-03-14 08:43:52 +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
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
Miikka Heikkinen
74761b0e64 QmlDesigner: Add fly mode for 3D view
You can now activate fly mode in 3D view by pressing right mouse
button. In fly mode, cursor is hidden and mouse controls edit camera
rotation directly, and WASDQE can be used to move the camera around.

Fixes: QDS-12030
Change-Id: I52550502632af19de36a1557d9aac84ff3cb18cc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-03-07 10:37:26 +00:00
Eike Ziller
c4e8963d8d Remove unneeded version checks
After we raised the minimum Qt version.

Change-Id: Ife81a25c3c205646eece30d6dd1a95f4b97eda01
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2024-03-04 14:16:15 +00:00
Tim Jenssen
56c4ba1db4 Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I1d328f67a1c538e36a54f9660d5fb2840a6753df
2024-02-29 19:40:30 +01:00
Tim Jenssen
4ef5338229 qml2puppet: use branding from qtcreator repository
To build a correct puppet with the correct version
number do:
cmake -DBUILD_DESIGNSTUDIO=ON

no branding argument necessary anymore

Change-Id: I74b25e3da296fe77d83892d0596f5da3c38ed6cf
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-29 12:47:53 +00:00
Eike Ziller
6c2df76737 Merge remote-tracking branch 'origin/13.0'
Conflicts:
	src/plugins/android/androidsettingswidget.cpp

Change-Id: Ifcb16aa16c7bc2792de25d0ee7a22cf0e39a05f8
2024-02-29 12:44:58 +01:00
Alessandro Portale
903d01b934 Welcome: Implement new design
2024 redesign

Change-Id: I6629849921272d856f201693973a8e29c6465e94
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-02-27 16:42:10 +00:00
Jarek Kobus
e8b3887dbf Axivion: Make use of Dto::IssueKind enum
Use Dto::IssueKindMeta::enumToStr() to convert it to string.
Rename icons accordingly.

Change-Id: I8a955f2f0075793eea761cd4a41374a65d2aaea2
Reviewed-by: hjk <hjk@qt.io>
2024-02-27 14:17:56 +00:00
Miikka Heikkinen
4db744cbf7 QmlDesigner: Add ReflectionProbe box visualization to 3D view
The box is visualized with wireframe box, just like setting debug view
property on reflection probe itself would do, only in 3D view the box
is shown when the probe is selected.

For simplicity, the box visualization is only done for single selected
reflection probes.

Task-number: QDS-11964
Change-Id: I1ad645517fa32785e4a5952b13cb3e10eb5f89b9
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-27 11:36:10 +00:00
Miikka Heikkinen
595ba9e68c QmlDesigner: Suppress reflections from helper grid and selection box
These are tools of the 3D view and shouldn't be reflected on reflection
probes added to the scene.

Fixes: QDS-11963
Change-Id: I6d32ed737e3801fbab81a746306de571a25ff363
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-26 14:14:02 +00:00
hjk
e678da9934 Require C++20
Change-Id: Id6581a4c32ec6411195edb51339f017e4ddb51ff
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-02-22 11:22:09 +00:00
Miikka Heikkinen
9d6d521643 QmlDesigner: Fix crash when reparenting items into effected item
Some effect related objects such as QQuickShaderEffectSource can be
silently removed alongside another object, so use QPointer to ensure
all objects are still valid before readding them.

Fixes: QDS-11973
Change-Id: I75ee2dc81e27774f8be87b031e149b135ec84023
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2024-02-16 14:30:44 +00:00
Tim Jenssen
adcac7cb6b Merge remote-tracking branch 'origin/13.0' into qds/dev
Change-Id: I242c01e82fc1b0db1f5e88c35d526f91dd022337
2024-02-13 14:33:35 +01:00
Marcus Tillmanns
7daee3d681 Remove unused qt-breakpad
Change-Id: I33937cc3e50d5dd03d38c64675dc3883c816290a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-02-07 10:17:49 +00:00
Miikka Heikkinen
c5f86ea0b5 QmlDesigner: Implement effect item visibility handling
Now effects made with effect composer can be hidden/shown using
visible property.

Fixes: QDS-11786
Change-Id: I44782246adfa3ba3cd0a8203fa67b3f5412535f7
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-02-06 15:22:27 +00:00
hjk
c6be4fd2d4 ProjectExplorer: Delay-create TaskHub
Effectively only by a few lines.

Change-Id: Ieb548d0a2f5ced033881106c76adc9a5e3e16663
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-02-02 06:21:02 +00:00
Tim Jenssen
a3a69d83f3 Merge remote-tracking branch 'origin/qds/dev' into 13.0
Change-Id: I09a0e8514c8ad7badaa7af6d101c71d5c96b5465
2024-01-31 20:25:34 +01:00