QtQuick3D was listed as a required module in dependencies. However,
you should be able to build QtGraphs without 3D features. In that case,
it is not necessary to have Quick3D. Therefore, the Quick3D required
field should be false in the dependencies. In addition, the baseline
tests must be turned off if 3D features are unavailable, as they link
to Quick3D.
Pick-to: 6.9 6.8
Change-Id: I6c45fde93d75d54b4adf89471441d989452b0245
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 6300f5af2f)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Based on API review.
Rationale: Non-trivial types should not be passed by value.
Task-number: QTBUG-137478
Change-Id: I9be369facb9f214e8bd11edbd67ef03c3c331de7
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit 60a29fd7f9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Properties hold a value, only the setter sets the value.
Change-Id: I986abb3f5424ef5d71bd44a08b643138fd1f36e3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 75ec4ffe74)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Scatter3DNode is not a part of Qt before 6.10, hence
2 separate commits with different pick targets.
Fixes: QTBUG-138797
Change-Id: Iaed5d38c81847ce9f75d21fb7b492d2cc8a972f6
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 1367d26953)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The enum from the same class can be used in member functions without
fully qualifying the type with the class name. This makes a difference
for string-based signal/slot connections, where the declaration without
the full scope makes connections also work if the full scope is not
provided in the SIGNAL and SLOT macros.
Addresses header review comment and amends
52a361988d.
As a drive-by, fix the capitalization of the setter parameter, and the
documentation of the property.
Change-Id: I1d9ca21dc8fd173852ca89ec3060dbb1da50c046
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 8f9c14c383)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Removes logic that caused setPieSize() and setHoleSize() to implicitly
modify each other. The setters now only affect their own respective
properties.
Pick-to: 6.9 6.8
Fixes: QTBUG-134003
Change-Id: I2d7b3e36d692248cd2de19dc6daa9d09a61c8158
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
(cherry picked from commit e2def3779a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
When series is created outside of graphsview and then added into
a graphsview, the app crashes while closing. This seems to be because
it ends up calling pure virtual type function from the QAbstractSeries
in the getSeriesRendererIndex. This patch adds type variable to
QAbstractSeriesPrivate. The variable is set by QAbstractSeriesPrivate
constructor. The getSeriesRendererIndex function checks the value of
that variable instead of calling the virtual type().
Pick-to: 6.8 6.9
Fixes: QTBUG-138506
Change-Id: I7aca4970c38cbf83413818b0a77e7cf5d76195b6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
(cherry picked from commit 630b38b3ee)
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Doing it this way should not break unity build, unlike
the previous attempt.
Pick-to: 6.9
Change-Id: Ibe7f305ba9e41d1465bad7bbb7fb61860b225a98
Reviewed-by: Tim Blechmann <tim.blechmann@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 4b815129c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This broke unity build, so it has to be reverted in this form.
This reverts commit 6ba5d8f00c.
Pick-to: 6.9
Change-Id: I58719cd79c53af764e973b47e115e0f4f02af917
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit ee46f585d9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Switching to mask mode does not seem to visually change
the labels much if at all, and it fixes the problem with approximate
OIT.
Fixes: QTBUG-138827
Change-Id: Ia222cf6c5ec6a8e764d06217b1593abe27e166e3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 330273682e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Since the enum only has two states,
`bool` is a more fitting and efficient underlying type.
Task-number: QTBUG-137478
Change-Id: Ieceb07b275f7fcee7a25982d856518690de04b78
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sakaria Pouke <sakaria.pouke@qt.io>
(cherry picked from commit 006758ac5f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: support for per-item scale for scatter graph
has been moved from QScatterDataItem to QScatter3DSeries.
This change avoids adding member data to QScatterDataItem, which
would break binary compatibility.
Task-number: QTBUG-137478
Change-Id: I07668e20a358e99740ea348f4c744e05518e2fcb
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit e8ed058e22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Do not introduce new APIs with QSharedPointer
Rationale: QSharedPointer's implementation is poor and requires
twice the number of atomic operations on copy than std::shared_ptr.
We want to remove the class in Qt 7.
Solution: Instead of returning shared pointer to a QQuickItemGrabResult
that is received from the QQuick3DViewport, extract the image from
the grab result and return a pointer to that instead.
Task-number: QTBUG-137478
Change-Id: I54cc9aece72cf8cf5ec4abaddc1da189d0c31b2b
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit 544bc177fd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The QML type is called Bars3DNode, not BarsNode. The same applies
for ScatterNode and SurfaceNode.
Change-Id: I040ab1bae22fc7e79f3b769d162d2c1b90ba1a7d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Andreas Eliasson <andreas.eliasson@qt.io>
(cherry picked from commit 2a19994f52)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: this change improves the clarity and semantics
of the enum by renaming SliceType to SliceCaptureType.
Enum values were also renamed to explicitly indicate the type of
slice being captured to an image.
Task-number: QTBUG-137478
Change-Id: I1c21180f064d26189ba4121e412f103017c00fd6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit ff599b3b56)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
The QAbstractseries::graph() function returned a private type
QGraphView which was mistakenly exposed in public documentation.
Added \internal to the doc comment to hide the function from public
API docs. Fixes the documentation leak of the private class.
Pick-to: 6.9 6.8
Task-number: QTBUG-138456
Change-Id: I4f2af5e43ada043788f841e570df1911351dcdbb
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
(cherry picked from commit 16b5a594e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Update angleSpanVisibleLimitChanged and
angleSpanVisibleModeChanged signals to include their
respective new values as parameters.
Maintain consistency with the rest of Qt.
Task-number: QTBUG-137478
Change-Id: I384ee60f933e0da15ca22cfc01eec693588dc183
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit c0f6e03ede)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
If data has been inserted with flipped order (filling Z axis
before X axis), detect it and print out a warning.
Pick-to: 6.9 6.8
Fixes: QTBUG-124738
Change-Id: I17bad88cdc8f0b8e336dc5fa18990cfd6afa46e0
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 0a647dded3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: the drawOrder property has been renamed to
zValue for consistency within the Qt Graphics API.
Task-number: QTBUG-137478
Change-Id: I8b82a998ca2d5165169d3184c493708b3214f24a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 9a2b68a825)
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
- Emit keyword being used with non-signal QQuickItem::update
[clazy-incorrect-emit]
- Missing emit keyword on signal call QAbstractSeries::update
[clazy-incorrect-emit]
- Don't call QList::first() on temporary [clazy-detaching-temporary]
- unused QString [clazy-unused-non-trivial-variable]
- unused QVector<SurfaceVertex> [clazy-unused-non-trivial-variable]
- Mixing iterators with const_iterators [clazy-strict-iterators]
- Call to temporary is a no-op: QByteArray::clear
[clazy-writing-to-temporary]
- Missing reference in range-for with non trivial type
(QList<QQuickGraphsSurface::SurfaceVertex>) [clazy-range-loop-reference]
Change-Id: I4eb70bdf306ee276e2e897b92719cae5f795624a
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
(cherry picked from commit 28cf96afa3)
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
When using namespaced Qt, we need to prevent symbol clashes with symbols
of the same name. So we namespace all globally visible classes.
Also removing an unused include and an empty statement.
Task-number: QTBUG-138543
Change-Id: I1820c59c07ede984955613e44d6a592794c41996
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 5f25c58e24)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Rename the VisibleMode enum to LabelVisibility
to specifically state that it controls label visibility in pie series.
Task-number: QTBUG-137478
Change-Id: If7834e180a3be90c8a5f69807ac9763b7e4ac853
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 8a24be6330)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Renamed the textElide property to textElideMode
to improve clarity and align with Qt naming conventions.
Task-number: QTBUG-137478
Change-Id: I5261055f686dd8b96576809ca266599a5c258fee
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
(cherry picked from commit 49468e7019)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Modified axisXChanged, axisYChanged, and
drawOrderChanged signals to include the new values as parameters.
This enhances signal-slot usage by allowing receivers to directly access
the updated value without needing to query the sender, improving clarity
and performance in reactive code.
Task-number: QTBUG-137478
Change-Id: Ifb0ce50d812607a5036614deb653edd528e6db3d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 0910f582e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Removed the constructor overload that
accepted a scaleRole parameter in QItemModelScatterDataProxy.
Task-number: QTBUG-137478
Change-Id: Iae85f6321e53189f68da5b15d586c9b52fadfd25
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 74ef58cc32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Updated DrawWireframe, DrawSurface, and
DrawFilledSurface enum values to use hexadecimal instead of decimal literals.
Task-number: QTBUG-137478
Change-Id: Ic96f424a2e5c60cf9a9ee500815a1c86cf890835
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit ed9feacf85)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Removed two constructor overloads of
QScatterDataItem that accepted scale and rotation parameters.
This cleanup likely reflects a shift toward more explicit property-based
initialization, simplifying the class interface.
Task-number: QTBUG-137478
Change-Id: I62e9b5b6087043272da37516f3f3988d363c031a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit f1ae92e76c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Based on API review: Updated the setScale method to take QVector3D
by value instead of const reference.
Task-number: QTBUG-137478
Change-Id: I4e0d9062cb90e840ddf2258d7772e7e1ce80a392
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 8ca4db6fa1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Alexey Edelev
Qt Submodule Update Bot
Tomi Korpipaa
Volker Hilsheimer
Kwanghyo Park
Sakaria Pouke
Sami Varanka
Jere Tuliniemi
Andreas Eliasson
Dheerendra Purohit
Tim Blechmann