| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-102405
Change-Id: I8ebc07858b0c60f3ba469f8d0e5d978d0ca3654f
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit ae915cba96bbce2d1c06b1a5a727c815f31933b9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Both define a struct called QAbstractItemModelForeign.
This led to a linking duplicate symbol issue with static Qt libraries:
duplicate symbol 'QAbstractItemModelForeign::staticMetaObject' in:
libQt6DataVisualizationQml_debug.a(mocs_compilation.cpp.o)
lib/libQt6QmlModels_debug.a(mocs_compilation.cpp.o)
Add a DataVis infix to the foreign types created by the module, so
they don't clash with the QmlModels ones.
Amends 8691caff2b685aba4b1e83292de6c4d34775ec0b
QmlModels type was added in 528547f5d9d6929f41c94e11591dae36f2794ba2
Task-number: QTBUG-102256
Change-Id: I0134ffb7da9e97ff347991a144b5297643aa4c0c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
(cherry picked from commit 1a9b00c205a31d218525a3a30e4eb39bd3884e21)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
| |
Change-Id: I3f7c7150b9a3409fa17a7009b2e69142d17548bc
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 40b4d53658a01f45e6d5a775448765b56e85fb16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The build system only records dependencies on module packages when
they start with the Qt:: prefix.
Do that for DataVisualizationPrivate.
This fixes the warning / error:
Found package configuration file:
Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfig.cmake
but it set Qt6DataVisualizationQml_FOUND to FALSE so package
"Qt6DataVisualizationQml" is considered to be NOT FOUND. Reason
given by package:
The following imported targets are referenced, but are missing:
Qt6::DataVisualizationPrivate
Amends 8691caff2b685aba4b1e83292de6c4d34775ec0b
Fixes: QTBUG-99724
Change-Id: I92a280121a0584bc1718237e8965a2b5dd0ba774
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 77a26e0c0ae1774822198545a4a956bb404fb31c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
| |
This module landing page follows the style and structure from the Qt
CoAP module landing page.
Task-number: QTBUG-100369
Change-Id: I7062888d0c5a13392c0e2b6f2970677b8a9269d0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit d7c379e9707887840f564d53d4db2c1b37d15394)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rename wireFrameColor to wireframeColor to be
consistent with other usage of wirfeframe in
QtDataVisualization.
Change-Id: I1ae6cd7372e46efa2a5d83856126d45355fcff60
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit e82f53b35010dbeae6a5e7d87e007518a4eb0cbb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-100400
Change-Id: I4d9c09b183413b0fe7dad303fe22aaecc5df6619
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
(cherry picked from commit 5bd40a48433fd93c583c9dd62db1d4b9b36dc278)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Fixes: QTBUG-97931
Pick-to: 6.2
Change-Id: I94cb6076ff5ce23240be2a5f04325dc724a55707
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
|
|
|
|
|
|
|
|
| |
Amends 793e48f42cd75
Fixes: QTBUG-97683
Pick-to: 6.2
Change-Id: Ib87660093e2dab98d6b61570064117c75d7345f4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added rowColors property for Bar3DSeries.
The property can be used draw the individual
rows in the series in different colors.
Autotests and a manualtest for the property were
added also.
Fixes: QTBUG-96682
Change-Id: I5c4f778189d079206500a9289490792584eab2b9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the hardcoded cpp exports with a generated one where it's
applicable. Change the cpp export macro name to the autogenerated one.
Task-number: QTBUG-90492
Change-Id: Iff6fbff102297feffd443b8b6fef61f5e8f135e5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added a hasSeries method to Abstract3Dgraph.
The method can be used to check whether a series
has already been added to the graph. In addition,
modified cpp and qml autotests to test
the added method.
Fixes: QTBUG-96683
Change-Id: I91f70ca15b6c5fbaa7691cd17bbfc2ef460c3d37
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Changed the documentation for QAbstract3DGraph
orthoProjection property. The documentation
promised too much so the extra lines were
removed.
Pick-to: 5.15 6.1 6.2
Fixes: QTBUG-96206
Change-Id: I07b42cf359cf6570d2364be737cb2c1bc8294596
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
customFilters defined in .qdocconf are not supported anymore by Qt
Assistant since Qt 5.13. Therefore remove them from all .qdocconf files,
also to avoid cargo-culting them to new help modules.
Task-number: QTBUG-95987
Change-Id: I3f07ddc1657abaa59e5c0b6756bf7833bbfd85cd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Changed signals in declaratives to take their
arguments as const ref when suitable.
Pick-to: 6.1 6.2
Fixes: QTBUG-95941
Change-Id: I3d582422793ee2bfb4cb5251dcacd55d3d3acca9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Added support for 16-bit heightmap in
QHeightmapSurfaceDataProxy. In addition, added a
manual test for testing the heightmap support.
Fixes: QTBUG-74814
Change-Id: Ief028a459600680593e8859c9e7b51fb2e43203c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added a new property to Bars3D. The property
controls the margin between the columns of
series. It can be used to show bars belonging
to same column, but different series
side by side. Also added autotest for qml and
cpp.
Fixes: QTBUG-69036
Change-Id: I3c353e9097a8be8cafc05f8f5120e4266baa4a5c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Added revisioning to surfaceseries wireframecolor.
Fixes: QTBUG-95923
Change-Id: I7962418ea02185be907c38d8b7cf879f1ebd88be
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the first or last column or row of the data
given to surfacedataproxy contains NaN values,
the surfacedataproxy might fail to find the
limit values for the axis. Changed limitValues
function in surfacedataproxy so that if it
doesn't find min/max values from the first/last
column/row it continues from the next column/row.
Added a test to verify that the limit values are
found when first/last row contains NaN values.
Pick-to: 6.2
Change-Id: Ica3eebb1c6072656f59394814c3fa5e334f12c54
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added color property for surfaceseries wireframe.
Modified surfaceseries cpptest and qmltest to
test the added property. In addition,
the documentation for the property was added.
Modified qmlsurface example to use the new
property.
Fixes: QTBUG-64748
Change-Id: I18f56258cdba2b3270dce7c8313cbf17e499ff39
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On touch controlled platforms,
the AbstractDeclarative didn't get any
touchevents. Fixed this by setting
acceptTouchEvents to true in AbstractDeclarative
constructor.
Pick-to: 6.1 6.2
Fixes: QTBUG-94364
Change-Id: I072be80a942afc71e86e5c352d078a90baaa066c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
Make the name of the help project match the name of the installation directory.
Pick-to: 6.2
Fixes: QTBUG-95270
Change-Id: I185f5d1c42dfd142cbf5d9104b342b559bd09a8e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When surface data contains NaN/Inf values,
the basegradient might get applied incorrectly.
Fixed the error by adding check for NaN/Inf in
getNormalizedVertex.
Pick-to: 6.1
Fixes: QTBUG-78767
Change-Id: I94d850f8ed21bc98dcbc4ba26b02989c1c1bf90b
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
As we have the RESOURCES argument to qt_add_qml_module now, we can as
well use it.
Pick-to: 6.2
Change-Id: I51311bb73bd200eecacf0d9e5e9bb8a2c7e60232
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GCC 11 says depending on it is deprecated:
bars3drenderer.cpp:237:42: required from here
qtbase/include/QtCore/../../../../../../src/qt/qt6/qtbase/src/corelib/tools/qcontainertools_impl.h:159:18: warning: implicitly-declared ‘constexpr BarRenderItem& BarRenderItem::operator=(const BarRenderItem&)’ is deprecated [-Wdeprecated-copy]
barrenderitem_p.h:51:5: note: because ‘BarRenderItem’ has user-provided ‘BarRenderItem::BarRenderItem(const BarRenderItem&)’
Note that copyable polymorphic classes are a big red flag.
Change-Id: I7246c3e7bb894e0d9521fffd168af24d8f0cd727
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a graph is rotated so that it is viewed from
below the y axis gets flipped. However, x and z
axis were not rotated correctly which caused them
to be unvisible.
Pick-to: 6.1
Fixes: QTBUG-94441
Change-Id: Ic56b910ce790526fd0460aa895ce978e6efd0b23
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
Fixes
warning C4996: 'QString::operator ==': Use fromUtf8, QStringLiteral, or QLatin1String
Pick-to: 5.15 6.2
Change-Id: I54fc1a85fa7a91806c9f8026a7258e80c944cbdf
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the camera's X rotation is 180.0f, the labels
were rotated to face wrong direction.
The axis title labels do not respect
the Abstract3DAxis's titleFixed property.
Created a new bugreport QTBUG-94441.
Pick-to: 5.15 6.1
Fixes: QTBUG-90371
Change-Id: I80115b8b363a7385dfd2cb1f004a05368549ed48
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Use declarative registration for QML types, and separate the backing
library from the plugin. Also, bump the revision numbers to account for
Qt6 and drop the "2" from the source directory name.
Change-Id: Ib48f90ad32a3624e7c31f1d2af9fcd92f069ee7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using static optimization for scattergraph
and series mesh type is not point mesh,
the scatter3D renderer uses
ScatterObjectBufferHelper's fullLoad. In
the fullLoad old data buffers are deleted, if
m_meshDataLoaded is set to true. However, at the
beginning of the fullLoad, the flag was always
set to false so old data buffers were
never deleted. Moved the setting of
the m_meshDataLoaded to false after the deletion
of old buffers. Added similar code to
scatterpointbufferhelper for consistency.
Pick-to: 5.15 6.1
Fixes: QTBUG-80194
Change-Id: I2fd71af86b1fd73621074187f112fd9783df36df
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Those modules are not used anywhere inside this module.
Change-Id: I21cafca4705172cfdaf4336cc4bfcc43d90306a7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is a low-risk port that leaves all the procedural registration
intact and just uses the CMake syntax.
Change-Id: I5cfbf345977e5ea522ce2da6111c1fe293be6a2c
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rendering a graph directly to background didn't
work in Qt 6 since it uses RHI and there is
no way to not clear the color buffer
before rendering. The graph uses direct OpenGL
calls to render directly to background. Enabled
direct rendering to qml3doscilloscope example.
In addition, RenderDirectToBackground_NoClear got
deprecated.
When rendering directly to background,
using non-transparent qml item as a background
will hide the graph. This was already mentioned
in the documentation but not clearly enough.
Updated documentation for AbstractGraph3D.
Pick-to: 6.1
Fixes: QTBUG-90665
Change-Id: I53081bac382ab89573359886e4f5c4b41be8e86d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.1
Task-number: QTBUG-86726
Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Setting the QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS variable
in the project ensures we ported away from old API calls.
Task-number: QTBUG-86815
Change-Id: I657ce43f65def5a13ca14030215a8adc37690d20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added pointer to graph in Abstract3DController.
Controller can use that pointer to check whether
the graph is ready when receiving
a themetypeChanged signal. Added manual test
for gradients.
Pick-to: 6.1
Fixes: QTBUG-93506
Change-Id: I13df962b807feb615e3267f580ef57dd62a0b058
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added check for new theme's forcePredefinedType
in ThemeManager's setActiveTheme before resetting
new theme's dirtyBits.
Pick-to: 6.1 5.15
Fixes: QTBUG-91103
Fixes: QTBUG-65264
Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-88742
Change-Id: I140a038ccb47433ff7fe437bfc002e580bfb21a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-88742
Change-Id: I155ad8d2d37a37b71851d95028bd0a26e2d034a9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
* Restore removed example snippet tags
* Fix issues in the .qdocconf file
Pick-to: 6.1
Task-number: QTBUG-91875
Change-Id: Iff7068204b5713fbf9f9f568834b55c5c282abba
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
That there is a 'using namespace QtDataVisualization' statement in the
'galaxy' manual tests suggests that there used to be one, but there isn't
anymore.
This documentation appears to have been for that long-gone namespace, so
remove it to silence qdoc. Fix references to the now global
qDefaultSurfaceFormat utility function.
Pick-to: 6.1
Change-Id: Ide7689ee30af60f8c97649672f8a0f5ad455c35e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.1
Change-Id: Idb633687f84c08f1b873a44af6fc9e1a64a4bee5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the
repo project version is used in a top-level build, rather
than the version of the qt5 project.
Pick-to: 6.1
Task-number: QTBUG-92861
Change-Id: I540849455689e22f954e4f6eeb1ae6a79a583795
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
Pick-to: 6.1.0
Pick-to: 6.1
Change-Id: Ib983262d4d90df3b976c91cbd2b6e9c652ae9932
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
| |
Pick-to: 6.1
Fixes: QTBUG-90663
Change-Id: Ifc972c20e273e5ae060bc70d289027350428599f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adding one row causes an assert
ASSERT failure in QList::at: "index out of range", file include/QtCore/qlist.h, line 373
since there is no first row to check the column count against.
Check for empty as well.
Pick-to: 5.15 6.1
Task-number: PYSIDE-1438
Change-Id: I225b87b764545b7a430472dc5a4b2e476a26a7ff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Pick-to: 6.1
Fixes: QTBUG-91347
Change-Id: Ice76d050c47fa141749b77a0313c2f070151bbc1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Clang may interpret static inline function as unused, although
it should not. Pragma it out for clang.
Fixes: QTBUG-91053
Pick-to: 6.1
Change-Id: I8fd8bec5236752189deff8a2f6ceb62e572dca30
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
SW renderer doesn't have opengles2 config set, so we need to
make sure the pointer does not include garbage.
Fixes: QTBUG-91032
Pick-to: 6.1
Change-Id: I98aa2f10889fe04c2f6f4af6abd0fe559ba686bf
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
| |
Fixes: QTBUG-90737
Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|