summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into ↵Tarja Sundqvist2023-03-016-43/+70
|\ | | | | | | | | | | tqtc/lts-6.2-opensource Change-Id: Id0d6ab8df0eb0f21043034092583a3ba53c0a093
| * 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>
* | Revert "Update commercial license headers"Tarja Sundqvist2022-11-24218-2616/+2616
|/ | | | | | | | | | | This reverts commit 1fc533376ff488371a58864a7863b6a83869eea1. Revert of commercial license headers is required for the Qt 6.2.x opensource releases, Qt 6.2.5 onwards. Task-number: QTBUG-107760 Change-Id: I2240ea52828f6ec670234884f9dd9f46f76b8bf0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>
* Update commercial license headersTarja Sundqvist2022-05-31218-2616/+2616
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtdatavis3d. Examples, tests, or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4940 Change-Id: I03e43b99e5a1adeebaa4e328c3126e6434cbc650 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Show CMake, qmake information in C++ class documentationKai Köhne2022-03-231-0/+2
| | | | | | | 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>
* Doc: Fix example manifest filesKai Köhne2021-11-091-29/+29
| | | | | | | | | Amends fc659e6de5 Fixes: QTBUG-97683 Change-Id: Ib87660093e2dab98d6b61570064117c75d7345f4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit fd64d7c70654fcf74f5b1aba9e90873ce0f6e07d)
* Do not use PUBLIC_LIBRARIES in qml moduleKai Köhne2021-11-081-1/+1
| | | | | | | | | Fixes: QTBUG-97931 Change-Id: I94cb6076ff5ce23240be2a5f04325dc724a55707 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit ecb014566ad827800480f716329f245fb2cc6cd4) Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Change name of help moduleKai Köhne2021-10-061-1/+1
| | | | | | | | | | Make the name of the help project match the name of the installation directory. Fixes: QTBUG-95270 Change-Id: I185f5d1c42dfd142cbf5d9104b342b559bd09a8e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 793e48f42cd75e9200ce838dec00221d73f5a586) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Fixes: QTBUG-96206 Change-Id: I07b42cf359cf6570d2364be737cb2c1bc8294596 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit eb938071956f96b861c33dd6cf14fafe63fc3587) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix: change signals to take values by const refSami Varanka2021-09-067-10/+10
| | | | | | | | | | Changed signals in declaratives to take their arguments as const ref when suitable. Pick-to: 6.1 Change-Id: I23ad15ba5bec39d9588425f71a24820199b33e8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix: Rotate and zoom don't work on androidSami Varanka2021-08-131-1/+4
| | | | | | | | | | | | | | | On touch controlled platforms, the AbstractDeclarative didn't get any touchevents. Fixed this by setting acceptTouchEvents to true in AbstractDeclarative constructor. Fixes: QTBUG-94364 Change-Id: I072be80a942afc71e86e5c352d078a90baaa066c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit fabf51e3e39d655e873addde891639009c7485c6) Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* 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. Change-Id: Ica3eebb1c6072656f59394814c3fa5e334f12c54 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit a9ccf1c7a1ccc7499e9a0d6178e9555caa364901) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Change-Id: I51311bb73bd200eecacf0d9e5e9bb8a2c7e60232 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit f418b60df676a4d0c1e467752692a701f528ba10)
* 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>
* Fix QML theme showing totally darkSami Varanka2021-05-071-1/+2
| | | | | | | | | | | | 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>
* Remove left-over .pri filesJoerg Bornemann2021-05-058-234/+0
| | | | | | Task-number: QTBUG-88742 Change-Id: I140a038ccb47433ff7fe437bfc002e580bfb21a6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove qmake project filesJoerg Bornemann2021-04-303-85/+0
| | | | | | | 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>
* Doc: Fix documentation issuesTopi Reinio2021-04-271-7/+6
| | | | | | | | | | * 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>
* Remove obsolete namespace documentationVolker Hilsheimer2021-04-203-13/+5
| | | | | | | | | | | | | | 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>
* Replace \default with \qmldefault for QML APIsVolker Hilsheimer2021-04-194-4/+4
| | | | | | Pick-to: 6.1 Change-Id: Idb633687f84c08f1b873a44af6fc9e1a64a4bee5 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-151-1/+1
| | | | | | | | | | | 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>
* Remove extra example from highlightsTomi Korpipaa2021-04-141-2/+1
| | | | | | | | 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>
* Add documentation for the RHI backend selectionTomi Korpipaa2021-03-041-0/+5
| | | | | | | | | 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>
* QSurfaceDataProxy: Fix crashes adding the first row of dataFriedemann Kleint2021-03-031-4/+8
| | | | | | | | | | | | 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>
* Prevent division by zeroTomi Korpipaa2021-02-251-6/+8
| | | | | | | Pick-to: 6.1 Fixes: QTBUG-91347 Change-Id: Ice76d050c47fa141749b77a0313c2f070151bbc1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix macOS build that has -Wunused-function as errorTomi Korpipaa2021-02-103-4/+4
| | | | | | | | | | 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>
* Prevent segfault with software rendererTomi Korpipaa2021-02-101-1/+1
| | | | | | | | | | | 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>
* Fix conan build errorsTomi Korpipaa2021-01-293-3/+7
| | | | | | Fixes: QTBUG-90737 Change-Id: Iab4a0f9d4ff3618dfb4c1675dfd731421de29f9f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove custom namespaceTomi Korpipaa2021-01-28208-426/+403
| | | | | | Fixes: QTBUG-90400 Change-Id: Ia2f1974a21112bad97724717d073d367c4413a7f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add CMake buildTuomo Pelkonen2021-01-2712-119/+645
| | | | | | | Task-number: QTBUG-89299 Change-Id: I5becbf39605e566c3d32cb5e210d974df9de27da Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix compilation issues for macOS and Android on Qt 6.0Tuomo Pelkonen2021-01-2711-31/+36
| | | | | | Task-number: QTBUG-89297 Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Force OpenGL backend for RHITuomo Pelkonen2021-01-273-0/+3
| | | | | | | | Set QSG_RHI_BACKEND environment variable to "opengl" to force RHI to use OpenGL backend. Change-Id: Ie1fa0ffe466f97b1bbcc5281c49bbdf6e6d053c0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* C++ build fixes for Qt 6.0 on WindowsTuomo Pelkonen2021-01-2711-36/+32
| | | | | | | | | | | | | Fixes c++ build issues with Qt 6.0, verified to work on Windows. Changed QQmlListProperty constructors functions types from int to qsizetype GeometryChanged changed to GeometryChange createTextureFromNativeObject changed to QNativeInterface::QSGOpenGLTexture::fromNative clearBeforeRendering and setClearBeforeRendering removed Task-number: QTBUG-89297 Change-Id: I84c723560de2821572af00f62e7780445b6c2595 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Migrate C++ API rendering path to Qt 6Tomi Korpipaa2020-12-1421-167/+175
| | | | | | | | | | Replace QRegExp with QRegularExpression and change usage accordingly. Replace shared QOpenGLFunctions_2_1 with our own copy. Fix header include changes. Task-number: QTBUG-89297 Change-Id: I6d3cf36ba9303ef62db3220816ea35f51eb26a3c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add missing overrideAlexander Volkov2020-06-2936-201/+201
| | | | | Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-2615-91/+91
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2557-219/+205
| | | | | | | Task-number: QTBUG-84469 Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-03-263-3/+6
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-243-3/+6
| |\ | | | | | | | | | Change-Id: I9152493c8aed299f0bcffc03651b05d6ae01db22
| | * Fix deprecation warningsFriedemann Kleint2020-02-172-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | colorgradient.cpp:80:61: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QtDataVisualization::ColorGradientStop]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations] declarativerendernode.cpp:116:71: warning: ‘QSGTexture* QQuickWindow::createTextureFromId(uint, const QSize&, QQuickWindow::CreateTextureOptions) const’ is deprecated: Use createTextureFromNativeObject() instead [-Wdeprecated-declarations] customformatter.cpp:167:34: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] Change-Id: Iaf3b8814cd70a704b87b4970ad83ed5a7d4dc0f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-01-281-1/+1
| | |\ | | | | | | | | | | | | Change-Id: Ie1823c477a005d44d7b12d1e6d9228d89b619298
| | | * Doc: Fix typo in qdoc commandPaul Wicking2020-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-81676 Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | | Update dependenciesFriedemann Kleint2020-03-2610-7/+15
|/ / / | | | | | | | | | | | | | | | | | | Add missing Q_MOC_INCLUDE and adapt to OpenGL split. Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 04:28:41 +0000