Floor was updated in each sync, triggering some dirty flags
being set. Update floor only if something affecting it changes.
Fixes: QTBUG-136174
Change-Id: I172a8b443fd6d65f9cac3390071329f95a731f47
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit f62322d262)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7a25a45ced)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Only call updateCamera if camera properties have changed.
Task-number: QTBUG-136174
Change-Id: I94f6c80e4c9e9e36a6399058bdd74866d2c0b202
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit 7deeaa5196)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit aadd8fd9e7)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
This does not fix the continous synchData completely, but removes
the unnecessary label updates.
Another patch is needed to take care of the endless sync loop.
Task-number: QTBUG-136174
Change-Id: I222deb86c25a4fafde73c550b0ae7151047a66e2
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
(cherry picked from commit f9fe3c37ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 4c96f4b0c4)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
qmatrix4x4.h will lose its qquaternion.h include, so include
qquaternion.h explicitly in all files that mention 'QQuaternion',
unless, for a foo.cpp, the own foo.h has already included it.
Also add forward declarations, where needed.
Amends the start of this module's history.
Pick-to: 6.8
Change-Id: I605bf742be5bb92a676704f12d738d241bd9b0da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 6a44c5fe57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit e23fb8de70)
Updated the PieModelMapper QML snippet by removing the invalid firstRow
and rowCount properties, and replacing them with valid ones.
Fixes: QTBUG-138257
Change-Id: I1628ea5b91cbe9f7c8618412c3e51a5d7408ad95
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 247a6b8f32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 8be300f54d)
This is the result of running util/normalize on the code base. The
following manual edits were needed:
(none)
Pick-to: 6.8
Change-Id: I26d9ba6799dec9fba0220d718679353231a7c8c7
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 4c03576ce1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 734d59ca63)
Removed qmlRegisterType calls from the qmake versions of the
AxisHandling and SurfaceGallery examples. These examples already had
the QML_ELEMENT macro in their classes. With this change,the qmake-based
examples now also work correctly withcompile-time QML type registration,
just like their CMake.
Pick-to: 6.8
Task-number: QTBUG-136712
Change-Id: Ieb6328f57dbb19373a3895572667c749af0ed344
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 96578b3b00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit ace78623ef)
Because QtGraphs has inherited many of its classes
from QtCharts, the modules have many classes with the same
name. Therefore, mixing QtCharts and QtGraphs headers in
the same TU violates ODR. This patch includes the check for that and
fails compilation with an error message.
Pick-to: 6.8
Task-number: QTBUG-135691
Change-Id: Ifedc1f6c7cf4823e58b650cd8d14275621a8470e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit e5194cb74e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
CustomScatter in tst_qmlbarscatter was still trying to use QQmlComponent *pointMarker property even though it has been renamed to pointDelegate
Pick-to: 6.8
Fixes: QTBUG-136950
Change-Id: Ic2d9d3b01d71e415f789e85253928471b2f5e0b3
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
(cherry picked from commit f4d674e412)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
axisRenderer had a bug in dragHandler controls where it would not allow
pointRenderers dragHandler to get exclusive grab over items, this resulted points not being able to be dragged. By giving dragHandler in axisrenderer small dragTreshHold, pointRenderer has enough time to get exclusive grab over eventPoint, and changing ungrabPassive to ungrabExclusive prevents zoomArea to collide with point dragging
Fixes: QTBUG-134592
Change-Id: I0a763221ad0dd855c0789fa284e376eee2ed3ac6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 0132ecfb0c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
qcustom3dvolume.cpp has a function that takes in QList<uchar> and
uses the given data to create a volumetric texture without checking
the validity
Pick-to: 6.9.1 6.8
Change-Id: I3a0987e8e5142f30dad8f3332d15ed344df26341
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 98f088fda1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
We exceed maximum texture size on certain platforms. Added a check
for it.
Pick-to: 6.9.1
Fixes: QTBUG-135384
Fixes: QTBUG-135386
Change-Id: I0a09337c9c6b831f801df35b5756327f45507237
Reviewed-by: Owais Akhtar <owais.akhtar@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 713a6e0b72)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Remove the ASM language where no assembler files are used.
Pick-to: 6.8
Change-Id: I461058a754991599d566cb9e63b43510b505f794
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 176f7d945a)
Tomi Korpipaa
Alexei Cazacov
Sakaria Pouke
Marc Mutz
Qt Submodule Update Bot
Niko Korkala
Dheerendra Purohit
Sami Varanka
Jani Heikkinen
Friedemann Kleint
Joerg Bornemann