summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.4.0' in qt/qt3dv6.4.06.4.0Qt Submodule Update Bot2022-09-231-4/+4
| | | | | Change-Id: I4cf5b6bd6652e5241ac4c716aaddde5c6ad7a59a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qt3dQt Submodule Update Bot2022-09-201-4/+4
| | | | | Change-Id: Icd2088cbc80fc46f949f8ae9a6b8816117a90a8a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qt3dv6.4.0-rc1Qt Submodule Update Bot2022-09-131-4/+4
| | | | | Change-Id: I3cdeb54b4326fafbbaa5da1234dab14e9d7813f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qt3dQt Submodule Update Bot2022-09-121-4/+4
| | | | | Change-Id: I72a087be78e729c2237a4081246ddeaae2334b4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qt3dQt Submodule Update Bot2022-09-091-4/+4
| | | | | Change-Id: I1f14755faca96de1105688b21afa4397308fb31e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4.0' in qt/qt3dQt Submodule Update Bot2022-09-081-4/+4
| | | | | Change-Id: I23d51f8f5bec0319b2bf7c36ef04210e1b235f89 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dv6.4.0-beta4Qt Submodule Update Bot2022-08-261-4/+4
| | | | | Change-Id: Ia0a284d2509cd69c0baba653e1d0dde1050631f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-251-4/+4
| | | | | Change-Id: I8eb5955db9d9a009868b01b9a65059c8140fb38e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Start using a dedicated QThreadPool again instead of a global oneDominik Holland2022-08-241-1/+1
| | | | | | | | | | | | | | This basically reverts a2b5b5c8f6e09ccfaca8044b34f4d9675c3be14a. The global thread pool is also available to the user and by changing the max thread count to something lower than the default, already running threads get stopped, which can cause segfaults. Fixes: QTBUG-104593 Change-Id: I21fea3137ea72b3336bc67499f9ee2f846e18845 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit f286d11852d956e589e30cf32686179baa28f66c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-221-4/+4
| | | | | Change-Id: Ib92ccbe96427d786fad8ca80eaec0f0e3915d535 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-181-4/+4
| | | | | Change-Id: I51ae404a01d5e4a38b318792a1a628c6925c892e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-161-4/+4
| | | | | Change-Id: I46457d496e6fb2b4ffb1f25ae55bccd7713e5dd2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-151-4/+4
| | | | | Change-Id: I1232b8ac74ab7363a4b3a8c74306cab0c2a54840 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AssimpIOSystem: use std::unique_ptr instead of QScopedPointerIvan Solovev2022-08-111-2/+4
| | | | | | | | | | | ... because QScopedPointer::take() is deprecated. Task-number: QTBUG-105513 Change-Id: I494088950a3f6791a6512ecbf230cd1d85ad7395 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit a0ed019e4ccb7505d10fc5977bc4b52b677cc8f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dv6.4.0-beta3Qt Submodule Update Bot2022-08-111-4/+4
| | | | | Change-Id: I63b30c8c6a7c5780efcc432b87e80f6d2e2d8950 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI backend: set texture handle on the frontend nodePaul Lemire2022-08-112-20/+44
| | | | | | | | | | | | | | | Allows to then use the handle with a 3rd party external renderer (e.g QtQuick with QQuickWindowPrivate::createTextureFromNativeTexture). Note: we need to be careful and only set the handles once we know the internal QRhiTextures aren't modified anymore. This means we can only do it after having created/updated the textures and the render targets as the render target creation might result in some QRhiTextures being recreated. Change-Id: I7e85fd2661cf935368ee55dc2ebd240bbda38a6f Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit bed3d7b000a0ce84523fa79ab29731716bb8ed3b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-091-1/+1
| | | | | Change-Id: I0882efecda4177a2dafdf315f47662de6039e752 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-081-4/+4
| | | | | Change-Id: I4bb8e9e1980e4788b476120626cd981f0776f8fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-08-021-4/+4
| | | | | Change-Id: I0305f2c0d1d466c32e8de823f9436194327d37ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-07-281-4/+4
| | | | | Change-Id: I05ada22cf5abd5724f0a4f5ee7a2449ba468a747 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-07-271-4/+4
| | | | | Change-Id: I32dde2506c2407017e30a46a49366840ab178f92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-07-251-4/+4
| | | | | Change-Id: I6a4a2828176398f2caaf07fa07e9df5097af1627 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-07-191-4/+4
| | | | | Change-Id: I7e7540ebb518a83278af52dc7ea9bbb9e40aacc6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QThreadPooler: remove maxThreadCount prototypePaul Lemire2022-07-181-2/+0
| | | | | | | | | Since implementation was removed in Qt 6. Change-Id: Ia2ca6a88bdb7d4fd02801ce8fac99cda3f39d102 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit a75f7b797cd460451cc727d0d972363fdd3e6c19) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-07-151-4/+4
| | | | | Change-Id: Ib7bc166d58a86911e40405c58094d83998ae19e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* RHI: fix Rhi::Renderer that creating bad QImage instanceYAMAMOTO Atsushi2022-07-141-2/+3
| | | | | | | | | | | Rhi::Renderer frees the memory referenced by QImage immediately after generating QImage. This memory should not be freed during using QImage. Task-number: QTBUG-104534 Change-Id: Ib17c91c1e87d7544d1bf9a836f554f351c0b3968 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit e70cdcc26d51410c6b2968160c549e55f12a5a5d) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies on '6.4' in qt/qt3dQt Submodule Update Bot2022-07-131-4/+4
| | | | | Change-Id: I92e15c14265f606c6968353adc4ce1ca257c5af9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Remove duplicate docs ObjectPicker::clickedYAMAMOTO Atsushi2022-07-131-8/+0
| | | | | | | | | | Remove one of the duplicate ObjectPicker::clicked documents. Change-Id: I4b46377520b7cd3ee7a07f4a325092e0471614ad Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 683203f9cbe7b21096e6a00f508c48cdbf57eca1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typo in \code blockYAMAMOTO Atsushi2022-07-133-3/+3
| | | | | | | | | | The correct Effect's property name is 'techniques'. Change-Id: I14806196d5972e0de4b66715b680c73813a7725b Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 60d9491808cf14c08bb8161da320fe9472cafdc3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typo BlendEquationArguments::destinationAlphaYAMAMOTO Atsushi2022-07-131-1/+1
| | | | | | | | | | The name of Property is BlendEquationArguments::destinationAlpha. Change-Id: I6fdd1bd2ae4293706dcffe3fbce01bd93763097a Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 0458a29f492763d1b03944eee42b8aaccec483e2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typo OrbitCameraController::zoomInLimitYAMAMOTO Atsushi2022-07-131-1/+1
| | | | | | | | | | The name of Property is OrbitCameraController::zoomInLimit. Change-Id: Id28e5a2dbc8b67ff5fc6e69fdddfc1f4ca03df42 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit f97c027ec239971ef11a1013af1d666264a9fd8f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* tests: fix a bunch of -Wsign-compareMarc Mutz2022-07-1220-105/+107
| | | | | | | Change-Id: I603612ecd55c8ac92fc28152a3cc0e192b8b67f1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 5e4c2097648e94146da2ed790764f731659f1ced) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* FilterKey: fix ambiguous relational operators in C++20Marc Mutz2022-07-122-8/+8
| | | | | | | | | | | | | | The member operators weren't const, leading them to be ambiguous with their reversed versions. Fix by adding a private equals() function (to avoid churning the implementation) and making the relational operators hidden friends. Task-number: QTBUG-104172 Change-Id: I97e74ef26fc2712d6f97c8f7d7bd61d6a625b42e Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit bcd20a74c9f2cd5920ecc5c1c0bb6d577db6cb50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix various [=] lambda captures to capture [this] insteadMarc Mutz2022-07-123-4/+5
| | | | | | | | | | | C++20 deprecated the implicit capture of [this] in [=]. Move Q_D()s into the lambdas, where applicable. Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 42f96fe2074bc63cfb8a4ae71a7262d554661da2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RenderViewBuilder: use QAspectManager::idealThreadCountPaul Lemire2022-07-122-6/+4
| | | | | | | | | | | Rather than QThread::idealThreadCount which isn't cached and could potentially return different values over time unlike QAspectManager::idealThreadCount which is cached and constant. Change-Id: Icb5fa81c93aa95af7bf020739bfefdf7e298f986 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from commit 925dae358913d7c614223a57552837dcc6e171e7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qt3dv6.4.0-beta2Qt Submodule Update Bot2022-06-301-4/+4
| | | | | Change-Id: Ia9ef707e37d83ef0aac269ec36ec5a8d788aa810 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix compile warningsMike Krus2022-06-294-3/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I6df471706c0d09386b867dad20935b8184a3445b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DCore: includemocsMike Krus2022-06-2931-0/+64
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ie1288d1bf081efc2177ade1ca940dd9334e22952 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DInput: includemocsMike Krus2022-06-2926-0/+52
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ie604554fd3e659173ae54e5f42c1a5b98d36f3f5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QtAssimpSceneImportPlugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I0c438492cb528a0d9fab3b374779a0c2b8cfe583 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QtGLTFSceneImportPlugin: includemocsMike Krus2022-06-291-0/+1
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Idff52f6aa8f50fec510b7c7473bf5e3e558644c3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QtDefaultGeometryLoaderPlugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Idfe787eb385aeb9a27389efa9a20b74eaf489122 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QtGLTFGeometryLoaderPlugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ibbaee88b24f63bc9a390353912eab20c474dc503 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DLogic: includemocsMike Krus2022-06-293-0/+5
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Id54c006a7aa3945c362efaa0124f8b4fc10b6d81 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DRender: includemocsMike Krus2022-06-29105-0/+210
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I24aa0ab52194abafa5c1e80f290eeacf82aa40eb Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DAnimation: includemocsMike Krus2022-06-2924-0/+48
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Ic2f635393e0351eac792320b0dac68997fa4a053 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DQuickInput: includemocsMike Krus2022-06-296-0/+12
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I4cdfecad1e1abe4b1d71704e924eff938135872c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DQuick: includemocsMike Krus2022-06-297-0/+15
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I95c4cb3206793ec8ece61071b6f5633ef903be6b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3DQuickExtras: includemocsMike Krus2022-06-293-0/+5
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: Id06cf8af6f426974d5cd0c3885ad32c082e45a4d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qtqtquickscene2dplugin: includemocsMike Krus2022-06-291-0/+2
| | | | | | | | (manual pick from dev as 6.4 was missing) Task-number: QTBUG-103286 Change-Id: I94b519ef8cecbaff7fcde7b1ebf1ceb891779048 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
View Lorry Controller Status