Commit Graph

8469 Commits

Author SHA1 Message Date
Lucie Gérard 8f339ea3d0 Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I97fa27f60a8546ea3d73cc7daf1b728c615a1ab0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-24 01:53:10 +02:00
Dominik Holland f286d11852 Start using a dedicated QThreadPool again instead of a global one
This basically reverts a2b5b5c8f6.

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.

Pick-to: 5.15 6.2 6.3 6.4
Fixes: QTBUG-104593
Change-Id: I21fea3137ea72b3336bc67499f9ee2f846e18845
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-08-23 11:48:18 +02:00
Qt Submodule Update Bot 026bcd4545 Update dependencies on 'dev' in qt/qt3d
Change-Id: Ice63181342efd8175c162c55ef6b31acc3bd8f4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-20 02:39:13 +00:00
Qt Submodule Update Bot 2bcc5afb23 Update dependencies on 'dev' in qt/qt3d
Change-Id: I80788204418be562ba988a62e21903f632641c47
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-16 12:47:08 +00:00
Qt Submodule Update Bot 052e4f8b7e Update dependencies on 'dev' in qt/qt3d
Change-Id: I96d76455f356d4643f30b2baaefc6563efe37f49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-08-12 19:48:01 +00:00
Ivan Solovev a0ed019e4c AssimpIOSystem: use std::unique_ptr instead of QScopedPointer
... because QScopedPointer::take() is deprecated.

Task-number: QTBUG-105513
Pick-to: 6.4 6.3 6.2
Change-Id: I494088950a3f6791a6512ecbf230cd1d85ad7395
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2022-08-11 09:44:39 +02:00
Paul Lemire bed3d7b000 RHI backend: set texture handle on the frontend node
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.

Pick-to: 6.4
Change-Id: I7e85fd2661cf935368ee55dc2ebd240bbda38a6f
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2022-08-11 06:57:04 +02:00
Qt Submodule Update Bot de14c77db2 Update dependencies on 'dev' in qt/qt3d
Change-Id: I7e0c6b88ca4f3b6949d96e7bf7e3a8a675d90a9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-28 08:40:51 +00:00
Alexandru Croitor 4ddbab6f63 CMake: Don't use PUBLIC_LIBRARIES for tests and test helpers
Change-Id: I393161c3adef90f776572c41d03305d2aa3979f8
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-07-27 13:48:03 +02:00
Qt Submodule Update Bot 1f1a8a145a Update dependencies on 'dev' in qt/qt3d
Change-Id: I833d33c09a64b87a33bd89bc6f58d999df2b8b54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-19 16:49:36 +00:00
Thiago Macieira d3b34e9433 tst_Matrix4x4_AVX2: add a placement operator new
Fixes a build error for me with upcoming changes:

qmetatype.h:2350:65: error: no matching function for call to ‘tst_Matrix4x4_AVX2::operator new(sizetype, void*&)’

Change-Id: I36b24183fbd041179f2ffffd17026a5a0a10f312
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-18 08:19:05 -07:00
Paul Lemire a75f7b797c QThreadPooler: remove maxThreadCount prototype
Since implementation was removed in Qt 6.

Pick-to: 6.4 6.3 6.2
Change-Id: Ia2ca6a88bdb7d4fd02801ce8fac99cda3f39d102
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2022-07-18 15:22:26 +02:00
Qt Submodule Update Bot 4f977caf06 Update dependencies on 'dev' in qt/qt3d
Change-Id: Ied7dbff9396eb5af37e50e2350a8a4ac4f37040e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-15 16:39:47 +00:00
Laszlo Agocs 8c73640425 Follow QRhi type cleanup
Fix the signature in qOverload.

Change-Id: I53048ed9e69166979487d8c2e87bace28a189ff8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-15 18:39:46 +02:00
Laszlo Agocs c09d4bba91 Follow QRhi instance step rate type change
The cast is now unnecessary.

Change-Id: If16f2ddd62cafe2393fda09b639788025799862a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-07-13 15:24:20 +02:00
Qt Submodule Update Bot ff364de148 Update dependencies on 'dev' in qt/qt3d
Change-Id: I88c9eafdf3215f28bb7b7419679f05240dfb1f99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-07-13 13:24:18 +00:00
YAMAMOTO Atsushi f97c027ec2 Doc: Fix typo OrbitCameraController::zoomInLimit
The name of Property is OrbitCameraController::zoomInLimit.

Pick-to: 6.4 6.3 6.2
Change-Id: Id28e5a2dbc8b67ff5fc6e69fdddfc1f4ca03df42
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-13 09:36:54 +09:00
YAMAMOTO Atsushi 683203f9cb Doc: Remove duplicate docs ObjectPicker::clicked
Remove one of the duplicate ObjectPicker::clicked documents.

Pick-to: 6.4 6.3 6.2
Change-Id: I4b46377520b7cd3ee7a07f4a325092e0471614ad
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-13 09:36:50 +09:00
YAMAMOTO Atsushi 0458a29f49 Doc: Fix typo BlendEquationArguments::destinationAlpha
The name of Property is BlendEquationArguments::destinationAlpha.

Pick-to: 6.4 6.3 6.2
Change-Id: I6fdd1bd2ae4293706dcffe3fbce01bd93763097a
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-13 09:36:46 +09:00
YAMAMOTO Atsushi 60d9491808 Doc: Fix typo in \code block
The correct Effect's property name is 'techniques'.

Pick-to: 6.4 6.3 6.2
Change-Id: I14806196d5972e0de4b66715b680c73813a7725b
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-13 09:36:40 +09:00
Marc Mutz 5e4c209764 tests: fix a bunch of -Wsign-compare
Pick-to: 6.4 6.3
Change-Id: I603612ecd55c8ac92fc28152a3cc0e192b8b67f1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-12 21:07:41 +02:00
Marc Mutz bcd20a74c9 FilterKey: fix ambiguous relational operators in C++20
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.

Pick-to: 6.4 6.3 6.2 5.15
Task-number: QTBUG-104172
Change-Id: I97e74ef26fc2712d6f97c8f7d7bd61d6a625b42e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-12 21:07:22 +02:00
Marc Mutz 42f96fe207 Fix various [=] lambda captures to capture [this] instead
C++20 deprecated the implicit capture of [this] in [=].

Move Q_D()s into the lambdas, where applicable.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-07-12 19:07:15 +00:00
Paul Lemire 925dae3589 RenderViewBuilder: use QAspectManager::idealThreadCount
Rather than QThread::idealThreadCount which isn't cached and could potentially
return different values over time unlike QAspectManager::idealThreadCount
which is cached and constant.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: Icb5fa81c93aa95af7bf020739bfefdf7e298f986
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-07-12 12:05:55 +02:00
Lucie Gérard 0802d82e08 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: I141f5077ae0c11e1058de64d573ca33e2a308ccd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-08 13:42:44 +02:00
YAMAMOTO Atsushi ebc966272a Fix 3D Render Capture crashed issue
m_pendingRenderCaptureSendRequests is touched by different threads
from Renderer::jobsDone and Renderer::executeCommandsSubmission.

It causes Assert and crashes and shuould be protected with mutex.

Task-number: QTBUG-104592
Pick-to: 6.2 6.3 6.4
Change-Id: I489691caeba2772f544fe1e4716053caf9492696
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-06-29 18:39:53 +09:00
YAMAMOTO Atsushi 60d957b8a0 fix RHI Renderer build for qmake
Add rhirenderetarget* files to pri file.
These were added int the commit 0b36fd620f

Pick-to: 6.2 6.3 6.4
Change-Id: Ibee9da40dbee18467e1d4c60429f46155ded859d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-06-28 02:21:15 +00:00
Qt Submodule Update Bot c35b1aa0b7 Update dependencies on 'dev' in qt/qt3d
Change-Id: I566eb8f65111d9d3219bfdd3947cac7a7fbebe3b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-06-24 14:30:29 +00:00
YAMAMOTO Atsushi e70cdcc26d RHI: fix Rhi::Renderer that creating bad QImage instance
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
Pick-to: 6.2 6.3 6.4
Change-Id: Ib17c91c1e87d7544d1bf9a836f554f351c0b3968
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2022-06-24 11:13:15 +00:00
YAMAMOTO Atsushi 489df1a7e1 Remove unused local variable
The local variable image is unused and has a duplicate name with the variable in the next lower scope.

Pick-to: 6.2 6.3 6.4
Change-Id: I2154042e8737b4dc53f2d4b3b47dd9ed292b9dec
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2022-06-24 09:16:56 +00:00
Mike Krus 0300d6336f Qtqtquickscene2dplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: If6e000cf45a430aff58cae48155562d117b8e027
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 13:19:05 +01:00
Mike Krus feed7cf15a Qt3D Tests: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I8e97b8d7f997fa42a791d0daebe5987e99c97b30
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 2624bc4e7a Fix compile warnings
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: Ie97b6e5375338007ebba4d1a6ae235f068453fb5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 400689d358 Qt3DExtras: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I07cce1da294d45a03bc1d0b9ef18629bba3a48e0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 8c2ba3e612 Qt3DQuickRender: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: Ie491bf6d3f492854e4a979650185c73eaaadf04c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 0f92fc937b Qt3DQuickScene2D: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I5cc37be9d217d511d56238ade3cf59acec8f4081
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 4af3641935 Qt3DQuickAnimation: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I3cc1eb16e1986ffb5f908a60f6f333cf33b9a347
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus d4b8a64153 Qtqtquick3dcoreplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: Ibe5d4e822c418f901bd7790cc73e6116bcca1aab
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 34aaca6c1f Qtquick3dextrasplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I45765ad198481b868cde062545116a4bf8d2f3da
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 1aeed8133c Qtqtquickscene3dplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I76bb0f856fb6b34fae3193851c0af54f37d384aa
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 353f352a90 Qtquick3danimationplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I7d79f1ab9724d2a33a3078d8b387502756d4a6d4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus bfbe7f3bf1 Qtquick3drenderplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: Ie916f27ced030efec052121084e8e9d87105f015
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 8c5f6d4de5 Qtquick3dlogicplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I78e1a67a974297fc4c8220cf4a44641d2f8ad6ce
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus 4df4dd5ff2 Qtquick3dinputplugin: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I0ae90b5447bafe917112fe446d50fc1d5e1aeb8e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-23 10:52:33 +01:00
Mike Krus b8837ca6f5 Avoid clash with internal resources handling in static builds
quick3d already defines a scene3d resource file, static build
generates some symbols to load these.
Avoid clash in symbol names by rename resource file here.

Task-number: QTBUG-102883
Pick-to: 6.3
Change-Id: I962c1a62e4a4379e4ccf0ac5d29383dc551ec8ec
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
2022-06-23 09:01:20 +01:00
Paul Lemire 36c3e53903 QViewport documentation: fix wrong property type for gamma property
Change-Id: I9af5214af3ad019e3adf55c7d4d9dfe43a5226ff
Task-number: QTBUG-101876
Pick-to: 5.15 6.3
Reviewed-by: Mike Krus <mike.krus@kdab.com>
2022-06-22 15:43:23 +00:00
Mike Krus 44cf93ae36 Qt3DQuickExtras: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: Ia1d99ba57137a3108f0646fa4502de1ae0bc4070
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-22 13:50:29 +01:00
Mike Krus b4c112f0a7 Qt3DQuick: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I877209c04cd1060b635c7a076069bb0c04de9fa9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-22 13:50:24 +01:00
Mike Krus dc42423a37 Qt3DQuickInput: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: I7a9daae16e505db50c0f17947e13694f741d8938
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-22 13:50:19 +01:00
Mike Krus b39992f426 Qt3DAnimation: includemocs
Task-number: QTBUG-103286
Pick-to: 6.3 6.2 5.15
Change-Id: Iea60fab6a1dbc8910d1f4226265f861eddec859d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2022-06-22 13:50:15 +01:00