Commit Graph

7806 Commits

Author SHA1 Message Date
Eike Ziller
85b60d9608 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I80fe565749ad5c06dfe99436f2dc6ab4b66a2537
2021-12-16 10:50:33 +01:00
Alessandro Portale
16ced8a7d6 Debugger: Describe right SBError for failed remote-android connection
It is the result of the previously attempted SBPlatform.ConnectRemote()
which we want to see in the logs if the connection fails.

Change-Id: Iec2760257eb8bb8c6b1df8aa3a5c010302966c8f
Reviewed-by: hjk <hjk@qt.io>
2021-12-16 07:23:36 +00:00
Miikka Heikkinen
d73be23c69 QmlDesigner: Make model used for instancing unpickable in 3D editor
The base model used for instancing is hidden at render time, so it
should not be pickable in 3D editor.

Fixes: QDS-5100
Change-Id: I7c58bd8e7e5c9bfbe75dbaff67c0fd99793ad610
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
2021-12-14 15:27:01 +00:00
Miikka Heikkinen
4751e9a771 QmlDesigner: Change 3D editor selection box appearance
The selection box in 3D editor no longer includes selection boxes of
immediate children for clarity. The box itself also now only shows the
corners of the box.

Fixes: QDS-3656
Change-Id: Iae3e884276f26385d6a362809b79a74e09c093a3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-14 13:03:32 +00:00
Miikka Heikkinen
fe1f5a644e QmlDesigner: Enable component library context menu while searching
The only item visible in the menu is remove module, as hiding
categories during search is not supported.

Fixes: QDS-5687
Change-Id: I8f5bb3f1b27eb37ae32d72b93c6ce2156dfa8eb7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-14 12:59:57 +00:00
Thomas Hartmann
af9ddbe011 QmlDesigner: Fix Qt 6.3 build
The include is not required and
the whole class defined inside is not used since Qt 5.6 anymore.
I will remove the pre Qt 5.6 code in another patch.

Change-Id: Icfc13376ceba3ee16b516156727f743e49a85127
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-12-14 09:17:26 +00:00
Henning Gruendl
5abae40f31 QmlDesigner: Fix PropertyEditor warnings
* Replace dummyBackendValue when it causes type mismatch. Assigning
  #000000 (string) to a SpinBox value (double) isn't supported.
* Fix backendValue undefined warnings
* TextInputSpecifics hide text format control as not available

Change-Id: I68381a54d1cc4603da1f2af08fa029b5afe94937
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-13 14:22:33 +00:00
Miikka Heikkinen
553de19151 QmlDesigner: Fix picking of Repeater3D/Loader3D generated nodes
There is no top level Repeater3D node with an actual instance
when the Repeater3D is inside a component. The pick target was not
correctly set in this case.

Now we set pick target on every encountered Repeater3D object so
we can propagate it to every object they create.

The same was done for Loader3D, which also creates nodes dynamically.

Fixes: QDS-5745
Change-Id: I537de28ff7426adaa29c2febc6c4b3416baeccb5
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-12-13 11:26:15 +00:00
Henning Gruendl
a6b7473350 QmlDesigner: Hide Audio-/VideoOutput for video
Hide controls for AudioOutput and VideoOutput in VideoSpecifics.

Change-Id: Icfb66d44cca815dd201c7beda33930ff86a5753e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-13 09:26:37 +00:00
Samuel Ghinet
1eda803e29 Improve the visual of the New Project dialog
* Reworked dialog header -- added DS logo, reworded title & subtitle,
  aligned them to the left
* Added radius for rectangles: Presets pane, Styles pane, the
  Orientation button
* Added extra padding for style items -- so it's easier to figure that
  the label is for the image above it.

Task-number: QDS-5500
Change-Id: Icebe8abb886401e5d075e4a372c0036468301490
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-10 12:56:53 +00:00
Mahmoud Badri
ba00795049 QmlDesigner: Make the states view responsive
When resizing the states view vertically, states now will update their
height to fit the available space.

Fixes: QDS-5753
Change-Id: I3aa352610122b49049979c84aba12d99a0da0ea5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-12-10 10:59:26 +00:00
Henning Gruendl
aa0f57b52a QmlDesigner: Fix multimedia specifics
Fix multimedia specifics in property editor by re-adding AudioSection

Change-Id: I65bd7c371ca86b643551e8943e64fb701f54017e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-10 09:41:56 +00:00
The Qt Project
03a0e6211d Merge "Merge remote-tracking branch 'origin/6.0'" 2021-12-09 13:19:14 +00:00
Kai Köhne
b098b8ffe4 Change wizards to use find_package(... REQUIRED COMPONENTS) idiom
Task-number: QTBUG-98867
Change-Id: I7812898c411d5366d1d2452f01bd856d194fde84
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-12-09 13:09:10 +00:00
Eike Ziller
d422b408e0 Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I32991a77e52831dd2e24cf4a51ec252998c2d743
2021-12-09 12:04:32 +01:00
Mahmoud Badri
5453c539b5 QmlDesigner: Remove flexible width from Component Library items
...so that resizing the view doesn't cause sluggish animation to the
items.
Also removed an unnecessary top padding from the horizontal lib to
avoid a slight vertical jump when switching between the 2 layouts.

Change-Id: I0af75db885398dc93fc234d760156a55042f59d0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-12-08 19:03:01 +00:00
Henning Gruendl
e1ecc23dac QmlDesigner: Remove duplicate family names
Remove duplicate family names in the font ComboBox.

Task-number: QDS-5695
Change-Id: I9f5bcf7f58dbcae012288689c0ec48a80451c328
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-08 19:01:26 +00:00
Samuel Ghinet
8c139603a1 QDS: shrink the right margin of the project view for small sized dialog
This also allows a bit smaller minimum width for the dialog.

Also, did a bit of cleanup.

Task-number: QDS-5500
Change-Id: I3660190ac0a73dd1da1c7d6f8ee76660b1fba6be
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-08 13:05:55 +00:00
Kai Köhne
a50cf058d1 Wizards: Use CMake by default
We focus on CMake as the preferred build system in Qt 6. qmake
is still supported, but we shouldn't advocate for using it anymore
for new projects.

[ChangeLog][Wizards] The wizards by default now use CMake
instead of qmake.

Fixes: QTCREATORBUG-25685
Change-Id: Ifa2a6a046d65015124229bbb278ec5dd317afa35
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-12-08 10:27:45 +00:00
Miikka Heikkinen
a4c2f2fb8c QmlDesigner: Fix Qt5 compilation
QQuick3DViewport::pickAll was introduced in Qt 6.2.
Checking against version 6.2.1 because that's when the global picking
API was taken into use in QmlDesigner.

Change-Id: Id69ff9d958da89ba9e043dfb082a99f640884a4e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-07 12:57:42 +00:00
Aleksei German
e8b471dc8e QmlDesigner: Fix for states delegate behavior
Task-number: QDS-5649
Change-Id: Id5d936c29fc832f3df8fa163c607562bc0983ed3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-07 09:58:11 +00:00
Miikka Heikkinen
9c15b5b16d QmlDesigner: Update _pickTarget of Repeater3D created objects
The objects Repeater3D creates are created after handleInstanceHidden
is called for the repeater instance, so the _pickTarget of the created
children doesn't get properly updated. Added signal handler to
make sure handleInstanceHidden is called again after all objects have
been created.

Fixes: QDS-5643
Change-Id: I8b63614fca0be3956b6896028e3f3a0f49bfe397
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-07 09:00:25 +00:00
Miikka Heikkinen
eba2a0520b QmlDesigner: Fix picking issues
We now check also the parent chain for pickability, because
a node is not pickable if one of the ancestors is not pickable,
as all properties picking depends on (visibility, locked state)
are implicitly inherited by descendants.

Rotate gizmo rings default to regular View3D picking when the angle
is so steep that the plane intersection is not reliable. With new
global picking enabled handling we need to check all hits instead
of just the first one.

Change-Id: Ib1aa604b06f7db1041f5d4c3019cc2badf29a20f
Fixes: QDS-5679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-07 08:18:35 +00:00
Mahmoud Badri
3f83fb91d6 QmlDesigner: Animate item library controls' hovering
Added animation behavior for hovering. Also added top padding to the
search field so that the text is correctly aligned vertically.

Change-Id: I51273373aa43ceb3a3faca6a9f76b613fdd0be69
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-03 14:31:43 +00:00
Mahmoud Badri
0a8ab22f41 QmlDesigner: Fix states context menu not working in certain areas
Fixed 2 issues with the context menu:
- Left clicking the area to the right of the states doesn't close the
context menu. The issues seems to be a bug in the ListView, solved by
limiting the width of the ListView to the states area width.
- Clicking (left or right) below the states area doesn't work. This is
because the height of the states view was fixed to the height needed.
Solved by not restricting the view height and do necessary changes.

Also some cleanups and removing unnecessary stuff.

Fixes: QDS-5324
Change-Id: Ic1e3f5d0776bb4770a3276c93ad1aee7a0049388
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-03 11:35:17 +00:00
Kaj Grönholm
4a5603b15c Adjust to model bounds calculation API change
Model bounds API changed with 25b757b7b0a286a392b3 so switch to new
API with version checks.

Task-number: QDS-5657
Change-Id: I6d880f179fc277f94ea9ac610ae682e9afbefe39
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-12-03 05:19:42 +00:00
Henning Gruendl
40c2d9a06b QmlDesigner: Remove audio wrapper
Remove the custom audio convenience type which should mimic the QML
Video convenience type only for audio. The custom convenience wrapper is
not working, because MediaPlayer is a QObject and can't have children.

Change-Id: Ic8d06e6397d8b7bb3bc531d47c1cb0b92142a742
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-12-02 23:35:17 +00:00
Henning Gruendl
9dd6635970 QmlDesigner: Add VideoOutput
* Add VideoOutput
* Add ComboBoxes to MediaPlayer specifics for selecting audio and video
  output ids

Change-Id: I52ea764b1301492754676a97d8d122275ba6dd81
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-12-02 23:34:34 +00:00
Eike Ziller
421d8038dc Merge remote-tracking branch 'origin/6.0'
Change-Id: I2ae142f02ee184d756932bf594c25addd3c2676c
2021-12-02 09:31:03 +01:00
Miikka Heikkinen
26ba5bdb0c QmlDesigner: Fix puppet crash with nested Repeater3Ds
Repeater3D instance instantiated by another Repeater3D got its
componentCompleted called twice because a repeater constructing a
child repeater already completes the component as part of the process,
and then we recursively complete the children again when completing
the parent. Added a check to avoid duplicate completions.

Fixes: QDS-5651
Change-Id: Iefc7deff4877df903f784396f2efd13468f604b7
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-02 08:09:58 +00:00
Antti Määttä
eadc9cb0e3 Improve particle system animation driver
- Do not automatically restart particle system animation when pressing the
  restart button if the animation is paused.
- Use own QElapsedTimer in AnimationDriver and properly handle animation
  driver pausing.

Change-Id: Ic2924fb66fddffb8878625be8fa766f06219ca61
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-02 05:32:45 +00:00
Samuel Ghinet
536f96fef8 Fix visual issues in new project wizard
* Make Project name text field have the same font size as the rest
* Use Titillium Web as the font family for the title
* Reduce the top padding of the dialog box
* Renounce the section "Advanced" from Details - we still have the items
  in the section, just not the section itself.
* Add scrollbar for the details pane - to allow smaller size dialog
* Move the tab bar (Presets) out of the GridView component - so that
scrolling the view would not also scroll the header.
* The Project view now shrinks if the dialog box is shrinked too much,
also reduced the minimum sizes of the dialog
* Resize dialog on screens smaller than 1920 x 1080
* Increase the space between Presets, Details, Styles text and their
top margin
* Lower the project item width from 144 to 90, so that project items in
the view are not so distanced from each other.
* Align the Cancel button with the left margin of the Style pane

Task-number: QDS-5500
Change-Id: I340967941c5c56c89b8741079cb64e355a283e3b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-12-01 09:35:16 +00:00
Henning Gruendl
f79a93dc2b QmlDesigner: Hide ComboBox ScrollBar if not needed
Change-Id: I1e8d9917b7b966b6c4e68459185c54dda7d21015
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-12-01 09:09:25 +00:00
Eike Ziller
d62d0f305b Merge remote-tracking branch 'origin/6.0'
Change-Id: I71b19dd8ecd96a7a2a58622f68283b8635264e48
2021-12-01 09:24:05 +01:00
Mahmoud Badri
53ffd806aa QmlDesigner: Remove faulty blue color behind docking widgets tabs
Fixes: QDS-5653
Change-Id: I71bc6267b1e40016fbcacc7ae4d6b21b76c8d701
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-11-30 13:14:38 +00:00
Miikka Heikkinen
09b2ceb96a QmlDesigner: Destroy old view before each navigator preview generation
If you triggered another preview generation while previous
is still going through the async loop, it was possible for puppet to
crash or create a preview image with e.g. both material and model
previews overlapping.

Fixes: QDS-5600
Change-Id: Ia11e01cff0503483dc4152aa412c3f9aea7fea6d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-26 11:24:16 +00:00
Thomas Hartmann
3ee0b55b7a QmlDesigner: Support transparent border for effects
If an effect uses transparent border int paints outside of the item.
Without this patch the item is only rendered inside the bounds of the item.
This patch always adds 40px to the bounding rectangle if an effect is
detected. This is done by effectAdjustedBoundingRect().
The 40px should be sufficient for every realistic case.

Task-number: QDS-3576
Change-Id: I82af0ea66c79039dcae92a88a5954b49de6d944f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-26 10:26:31 +00:00
Miikka Heikkinen
2be4efd475 QmlDesigner: Fix navigator preview of imported 3D components
Rendering of preview tooltip 3D content requires rendering multiple
frames to find the correct zoom level for a nice preview image.
This used to be done in a synchronous loop, which doesn't work in Qt6.
It doesn't work anymore because preview tooltip rendering uses a
selection box encompassing the component scene for finding the proper
zoom level. Selection boxes use custom geometry, which in Qt6
requires asynchronous rendering to allow the geometry to update between
frames.

Fixes: QDS-5600
Change-Id: Ib5e54a04ad5df2a8706fd22e554232feb45dd51e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-26 08:27:03 +00:00
Miikka Heikkinen
56028311f1 QmlDesigner: Remove dummy View3D workaround
The underlying issue requiring the workaround has been fixed in Qt6.

Change-Id: I36ca14112ae86a558be0cfc43c192e26dfde7efd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-11-26 08:21:53 +00:00
Mahmoud Badri
aad500cdab QmlDesigner: Animate the tab strip in the new project wizard dialog
Change-Id: I7af0c9b45c77d6742003319f7504d99d2df06d1f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-25 16:30:19 +00:00
Samuel Ghinet
bdf3fc27a2 Fix: QDS New Project dialog text color is not DStextColor
Task-number: QDS-5501
Change-Id: I323cf62a5149eeb062cdb87f2d59511a6bfd4662
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-11-24 10:43:25 +00:00
hjk
56009b8b15 Merge remote-tracking branch 'origin/6.0'
Change-Id: I0eae76ecff1a315877e4fdd471f0de3a3a55f180
2021-11-24 11:37:12 +01:00
Antti Määttä
bf6f41322c Handle particle system animation when selecting child object
Do not stop particle system animation when user selects particle system
child object. Instead continue particle system animation and if the child
parent particle system is another particle system, enable that animation.

Task-number: QDS-5562
Change-Id: I334f522536b53e7fb5cbebf8f7e9914f6394d165
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-24 05:44:45 +00:00
Miikka Heikkinen
5841a159c0 QmlDesigner: Fix capitalization of rotBlocked@Internal aux property
The "@Internal" part of aux property must have the "I" capitalized
for it to avoid affecting document modified state.

Fixes: QDS-4802
Change-Id: Ibbf0006ba6c24bad3ad017a72196dac1d366fe94
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2021-11-23 14:29:51 +00:00
Christian Kandeler
8f611286f7 Fix some compiler warnings
Change-Id: I9128afcf56bd47cb6627012bb6b0d13395b432ac
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-11-22 13:39:08 +00:00
Samuel Ghinet
4c36e157af QDS New Project dialog: capitalize the first letter of the Project Name
Capitalize the first letter of the project name When the user finished
editing.

Change-Id: I7222bbd9a13d275fa13028cdc24cfd781c7a791f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-11-22 12:37:28 +00:00
hjk
4de74a67ee Merge remote-tracking branch 'origin/6.0'
Change-Id: I773141d47e3f2b773da51f2e26ef53b93bb28f90
2021-11-22 13:18:08 +01:00
Miikka Heikkinen
cb00a8d30f QmlDesigner: Fix orthographic camera hdpi issues in edit 3D view
There is no need to double the viewport anymore when calculating
orthographic camera frustum visualization, Qt6 correctly accounts
for device pixel ratio in ortho projection. Even in Qt5, the old
hack only made frustum visualization correct for hdpi screens while
breaking it for regular screens.

Also fixed zoom factor handling for orthographic edit camera mode.

Task-number: QDS-5469
Change-Id: Ie53b5dfa2fbcc00f098ea64e5a6673e4b7af0963
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-22 10:14:42 +00:00
Eike Ziller
eba4115b82 Merge remote-tracking branch 'origin/6.0'
Change-Id: I3bab4e31bc5993c59c7025ebde0846bf6c75810e
2021-11-19 10:44:15 +01:00
Miikka Heikkinen
afe77aa646 QmlDesigner: Fix 3D edit view rendering logic
If we have more than one render in queue for 3D edit view, we know the
current render is not good, so do not send it to creator side but
instead wait until we have just one render in the queue.

Also changed the timeout for queued renders to closely correspond to
60fps frame time as there is no point rendering any faster than that.
This also means we never need to queue more than two frames to ensure
correct results.

Fixes: QDS-5467
Change-Id: I49a3a7aeaff24484f48784d0391414165ce50748
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-19 08:19:02 +00:00