summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Port from qAsConst() to std::as_const()Marc Mutz2022-11-182-2/+2
| | | | | | | | | | | | | | | | We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: Ibaafa3fc193a57cd9b16f387a03ab8f640f6688a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Port from container::count() and length() to size() - V5Marc Mutz2022-11-185-15/+15
| | | | | | | | | | This is a the same semantic patch (qt-port-to-std-compatible-api V5 with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to avoid cherry-pick conflicts. Change-Id: Ia27645cbf2b156fb594a7878dc6405f5b1a40692 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Doc: Normalize page namesKai Köhne2022-11-021-3/+3
| | | | | | | | | | | | | | | qdoc does enforce lowercase file names for .html pages, and also replaces underscore with a dash. Make sure that the original \page name already is normalized, so that it's easier to search. This was done by find . -name "*.qdoc" -exec perl -p -i -E "s/\\\page (.*)/\\\page \L\1/ && s/_/-/g" {} ; Change-Id: I3fc5896a62af744d5fd9ac4956ba4b3a2594df0a Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit e9b4324a7eda473e43a3fc345eaeed8ec02cfc4a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename shader and mesh resource filesTomi Korpipaa2022-10-112-4/+4
| | | | | | | | | | | | | | | | WASM gets a conflict with Multimedia if the resource file is named just shaders. Doing the same for meshes to avoid future conflicts with some other modules. Fixes: QTBUG-107505 Change-Id: I9107f270d8679d1a50ec8127d15cb0c50856eb7c Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Dilek Akcay <dilek.akcay@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit f691637777d31503f6681ed8c89c83e88c09a4c3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Do not crash if custom object load failsTomi Korpipaa2022-08-266-43/+70
| | | | | | | | | | | | | | | | There was no check for the existence of UVs or normals in an OBJ file. A check for those was added. Additionally a debug message was added in case model loading fails due to missing UVs or normals. Furthermore, we no more qFatal out when custom object loading fails. Fixes: QTBUG-105398 Change-Id: Ie2742fb4307fe117e313cedf8111bc8f460f9c7b Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io> Reviewed-by: Dilek Akcay Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 449f644df503dc409514cafd7b46ee8664e4d451) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Specify module headerKai Köhne2022-07-221-0/+1
| | | | | | | | | | | Fixes (qdoc) Could not find the module header in include paths for module "QtDataVis3D" Change-Id: I6d79454dbacc06805cea986b5f0739febed6a085 Reviewed-by: Luca Di Sera <luca.disera@qt.io> (cherry picked from commit f75554d082c46098c64719b8c41e254f0351e054) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix layering violation involving AbstractDeclarativeMarc Mutz2022-07-066-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying an ubsan build of qtdatavis3d, I get: abstract3dcontroller.cpp.o: undefined reference to `typeinfo for AbstractDeclarative' Turns out that AbstractDeclarative is defined in DataVisualizationQml, a separate library, which depends on DataVisualization. It seems this worked because Abstract3DController only used inline members of AbstractDeclarative, so a normal build doesn't need the class exported, even though it's curious that inline isReady() calls exported QQuickItem::isComponentLoaded() and the linker didn't complain. But an UBSan build requires the type_info, which isn't available, because the class wasn't exported, and cannot be made available because of the layering violation. To fix, Extract Superclass AbstractDeclarativeInterface that provides only the required isReady() function, but lives in DataVisualization, and have the real AbstractDeclarative inherit it. As a drive-by, make isReady() const. Fixes: QTBUG-104714 Change-Id: I0eb718746355f409a4105e2d53e79b7003fd8b22 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit 24106d1e1c818b358f919ce5cbff219b5a9f8b6a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix -Wunused-function on non-OSX platformsMarc Mutz2022-06-211-3/+1
| | | | | | | | | Found by headerscheck. Change-Id: If3c7e2a10132a1201a08db1fb9b71d0cdcd395ff Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> (cherry picked from commit 05b90ceb502c42a41b8acff3d6bc28bb66294a3a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-13227-6338/+454
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I3b3112f5a36673b90fff0010f973d020886cf08d Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 7d498a8cf5fbebd1308d43fe6637bd4934f0bae4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Scatter3DRenderer: initialize variable to make GCC 12 happyThiago Macieira2022-04-251-1/+1
| | | | | | | | | | The compiler thinks the variable could be used uninitialized. It can't... scatter3drenderer.cpp:385:49: error: ‘oldVisibility’ may be used uninitialized [-Werror=maybe-uninitialized] Change-Id: If05aeeb7176e4f13af9afffd16e85d357c2288ab Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Clarify the usage of SelectionMultiSeries flagTomi Korpipaa2022-04-081-0/+2
| | | | | | | | Pick-to: 6.3 Fixes: QTBUG-102405 Change-Id: I8ebc07858b0c60f3ba469f8d0e5d978d0ca3654f Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove clash with QmlModels QAbstractItemModel foreign typeAlexandru Croitor2022-04-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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 Pick-to: 6.3 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>
* Fix errors caused by dependency updateTomi Korpipaa2022-03-311-6/+10
| | | | | | | | Fixes: QTBUG-102139 Change-Id: Id9bc508f714a51915fd4d8f67e36561942e19c74 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Show CMake, qmake information in C++ class documentationKai Köhne2022-03-231-0/+2
| | | | | | Pick-to: 5.15 6.2 6.3 Change-Id: I3f7c7150b9a3409fa17a7009b2e69142d17548bc Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* datavis3d: do not rely on transitive includesFabian Kosmale2022-03-112-0/+2
| | | | | Change-Id: I837af484ee94b4a55bd4f6a404ea5b98b800d093 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-082-1/+3
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* CMake: Record package dependency on DataVisualizationPrivateAlexandru Croitor2022-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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 Pick-to: 6.3 Fixes: QTBUG-99724 Change-Id: I92a280121a0584bc1718237e8965a2b5dd0ba774 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Doc: Revise Qt Datavis module landing pageAndreas Eliasson2022-03-031-26/+23
| | | | | | | | | | This module landing page follows the style and structure from the Qt CoAP module landing page. Task-number: QTBUG-100369 Pick-to: 6.3 Change-Id: I7062888d0c5a13392c0e2b6f2970677b8a9269d0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix API review findingTomi Korpipaa2022-02-106-22/+22
| | | | | | | | | | | Rename wireFrameColor to wireframeColor to be consistent with other usage of wirfeframe in QtDataVisualization. Pick-to: 6.3 Change-Id: I1ae6cd7372e46efa2a5d83856126d45355fcff60 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix API review findingTomi Korpipaa2022-02-022-2/+2
| | | | | | | Pick-to: 6.3 Fixes: QTBUG-100400 Change-Id: I4d9c09b183413b0fe7dad303fe22aaecc5df6619 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove unused .qrc filesJoerg Bornemann2022-01-182-76/+0
| | | | | | | | Task-number: QTBUG-94446 Change-Id: I109795238dc1c19cf0b6e242aa186c8046f13404 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Do not use PUBLIC_LIBRARIES in qml moduleKai Köhne2021-11-021-1/+1
| | | | | | | | 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>
* Doc: Fix example manifest filesKai Köhne2021-11-011-26/+26
| | | | | | | | | Amends 793e48f42cd75 Fixes: QTBUG-97683 Pick-to: 6.2 Change-Id: Ib87660093e2dab98d6b61570064117c75d7345f4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add row colors for Bar3DSeriesSami Varanka2021-10-088-4/+187
| | | | | | | | | | | | | 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>
* Migrate to autogenerated cpp exportsAlexey Edelev2021-09-2746-54/+46
| | | | | | | | | | | | 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>
* Add hasSeries method to Abstract3D graphSami Varanka2021-09-2413-2/+57
| | | | | | | | | | | | | 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>
* Fix: QAbstract3DGraph orthoProjection docsSami Varanka2021-09-061-5/+0
| | | | | | | | | | | | | 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>
* Doc: Remove unsupported customFiltersKai Köhne2021-09-031-3/+0
| | | | | | | | | | 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>
* Fix: change signals to take values by const refSami Varanka2021-09-026-9/+9
| | | | | | | | | | | 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>
* Add: Support for 16-bit heightmapSami Varanka2021-08-313-22/+222
| | | | | | | | | | | 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>
* Add: Margin between series columns in Bars3DSami Varanka2021-08-249-8/+116
| | | | | | | | | | | | | | 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>
* Add: surfaceseries wireframecolor revisionSami Varanka2021-08-201-2/+2
| | | | | | | | Added revisioning to surfaceseries wireframecolor. Fixes: QTBUG-95923 Change-Id: I7962418ea02185be907c38d8b7cf879f1ebd88be Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix: Nans at surfacedata row/column 0 render failSami Varanka2021-08-111-26/+54
| | | | | | | | | | | | | | | | 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>
* Add: Colorize surfaceseries wireframeSami Varanka2021-08-066-1/+52
| | | | | | | | | | | | | 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>
* Fix: Rotate and zoom don't work on androidSami Varanka2021-08-041-0/+3
| | | | | | | | | | | | | 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>
* Change name of help moduleKai Köhne2021-08-031-1/+1
| | | | | | | | | 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>
* Fix: basegradient applied incorrectly to surfaceSami Varanka2021-08-031-1/+2
| | | | | | | | | | | | | 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>
* Split other resources from QML_FILESUlf Hermann2021-06-301-0/+5
| | | | | | | | | 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>
* Add missing operator=Thiago Macieira2021-06-233-0/+4
| | | | | | | | | | | | | | | 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>
* Fix: Axis titles do not respect title fixedSami Varanka2021-06-221-0/+20
| | | | | | | | | | | | 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>
* Encapsulate raw string with QLatin1StringKai Köhne2021-06-221-1/+1
| | | | | | | | | 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>
* Fix bargraph labels face wrong directionSami Varanka2021-06-111-3/+7
| | | | | | | | | | | | | | 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>
* Modernize and update to latest CMake APIUlf Hermann2021-06-1163-2857/+372
| | | | | | | | | | 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>
* Fix Q3DScatter memory leakSami Varanka2021-06-082-1/+2
| | | | | | | | | | | | | | | | | | | | 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>
* Remove references to multimedia and xmlpatternsLars Knoll2021-06-071-1/+1
| | | | | | | Those modules are not used anywhere inside this module. Change-Id: I21cafca4705172cfdaf4336cc4bfcc43d90306a7 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Port to new CMake API for QMLUlf Hermann2021-06-052-66/+32
| | | | | | | | | 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>
* Fix direct rendering doesn't show anythingSami Varanka2021-06-042-44/+16
| | | | | | | | | | | | | | | | | | | | | | 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>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-221-68/+68
| | | | | | | | 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>
* CMake: Disable usage of CMake API compatibility wrappersJoerg Bornemann2021-05-221-1/+1
| | | | | | | | | | 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>
* Fix Gradients don't showSami Varanka2021-05-185-2/+13
| | | | | | | | | | | | | 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>