| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
RHI renderer use ShaderTools which is GPL licensed. This patch
disables the plugin by default until Qt3D provides a suitable
replacement for the dependency.
To enable the RHI backend, compile Qt3D and pass parameter
-DFEATURE_qt3d_rhi_renderer=ON to cmake.
Unfortunate side effect of RHI backend being disabled is that
when using Scene3D, the QtQuick renderer must be configured to
use the opengl backend.
[ChangeLog] RHI Backend is not longer built by default
Task-number: QTBUG-94960
Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 3964b273459c2999f33d51b96afe6fb68f07d52f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
It requires Qt Multimedia, but as that API has changed
significantly, the example won't currently compile.
Change-Id: Ic64ec8382b6a3dc778b1a9e2d6ff95a200fe8415
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-86726
Change-Id: I2a7748b67b55008962809ece1a34c6cf2a0617bb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
- use qrc:/ prefix for resources required by Qt 6
- for Qt3D OpenGL backend as RHI as no support for Geometry/Tessellation
shaders
Change-Id: Ie5bd0381088de561ead0c5592f16bbacb68043e6
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
| |
As RHI has no support for Geometry Shaders
Change-Id: I1f7f3a375be463936e5bda59362b08d9b0e34c9a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
| |
Since we haven't ported Scene2D over to Qt6 yet following the whole
QtQuick rendering changes.
Change-Id: I95c6eb8d70bcfafa2ee51ee684b2e4b9177f1f13
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
| |
Pick-to: 6.1
Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
So that assets are properly picked up by Qt 6
Change-Id: I78eb79f0c4f5a2e124d57692d4af2947e743bd33
Pick-to: 6.1 6.0
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: Id9574cf23b9af29815d8452915cebfc380fd94d1
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
| |
Haven't tried to run anything, it just builds
Change-Id: I6c2c2a949bc3892a363697cf38f1608af87c303c
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Built with QtQuick disabled.
- C++17 required
- minor issues with QList vs QVector
- QMutexLocker templated vs not
- moc forward declaration handling
Change-Id: I5540625e74e2c009e528f56203e4b88be8d54599
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Id3ab38d02f8df7701410b8fcef8e112057825ecf
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
| |
Change-Id: I4246c59903a6d8f302a916ba7d19e9e37b5fe9c8
Pick-to: 6.0 6.0.0
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
| |
Pick-to: 6.0 6.0.0
Change-Id: I723807d46d043c4d78dd6c6ead598886a7974efb
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
| |
Pick-to: 6.0 6.0.0
Change-Id: I2e356cb893710c759a4d73eaf850ce39d46e5935
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
| |
Pick-to: 6.0 6.0.0
Change-Id: Id1dfc3c6a6f0c8090b5c5facc1a0dd9bb5a02bd6
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
| |
Pick-to: 6.0
Pick-to: 6.0.0
Change-Id: I56f1bb06479f82a10dda6dce0902a64381cd8147
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
|
| |
- QVariant::Type deprecated, use QMetaType related APIs
- QNodeId not used as reference in for loops (nop but really noisy)
- some unused code
Change-Id: I291219207fcd1ad0bf89533b4e2bb5fa47a353bb
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: Ifc20f29a849be695558851d5ea01a68f94c35f26
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I450e53cc716235db1bc0675c904466050e17296d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-87661
Change-Id: I594521a2b9aada164d684b8ef6ce71c730bfb64a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: I272cfa7688260f4ffb6b8ff49012188f717f62f4
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Many of the examples were missing find_package() calls.
Some were missing some example install dir things.
Some missing special cases.
Some incorrectly specified library names due to missing mappings in
pro2cmake.
Some incorrectly specified target names.
Change-Id: I131a02dc679502ea6c1cdeb32962e77f09e672af
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Re-generate examples, but only the chunks that handle
INSTALL_EXAMPLESDIR, because there have been so many manual changes that
were not special-cased.
Fixes: QTBUG-87331
Change-Id: I0926c015ce2733b462adba18e3dbf47621a7e679
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
|
|
|
|
|
|
| |
Task-number: QTBUG-86815
Change-Id: I7a8755571c8977be1f16b2287e5a8055e9016ee5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
| |
Rename Android package name org.qtproject.qt5.android to
org.qtproject.qt.android to avoid inconsistency with Qt 6 name.
Task-number: QTBUG-86969
Change-Id: Ife5db0d7272473872231a9f3cf94171dea95945a
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
| |
Change-Id: I37d0e1a0c56b874122e0db3ac60a90d19819630d
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
By default, Scene3D will select the RHI backend.
If QQuickWindow::graphicsApi() is set to QSGRendererInterface::OpenGLRhi
(QSG_RHI_BACKEND set to "opengl") then Qt3D will select the OpenGL
backend.
It's possible to use the OpenGL backend to RHI by setting
QQuickWindow::graphicsApi() to QSGRendererInterface::OpenGLRhi
AND setting QT3D_RENDERER to "rhi".
(Note that setting to QSGRendererInterface::OpenGL has not effect).
Change-Id: I71488ddb290ce2e30c724ddcc10c57ed8afe267b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Introduce new geometry view class for each.
Change-Id: I8e9a8f3a078d4cc63f9656ae8142e39f05d755c7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I7c91d265d1eecaceff434b88311a8f0ea9c1c51d
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
| |
Its DeviceType also becomes an enum class, so needs one more layer of
namespace prefix.
Change-Id: Iec519721f30811d91348de92a11ffc82ba86e81d
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
| |
Example was referencing assets that were removed a long time ago
Change-Id: I9ab76c53d565d4579b9f7ffc9c69789d836d0159
Pick-to: 5.15
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
| |
Not all work
Change-Id: I7954f9fe41160c929ff48f8bdeae635b900fef33
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: I1e62b901adc2896129aab7ff714ca8bd3e762d69
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
| |
Change-Id: Ie9a73a025bc8de8dc58b6f283dc8467d9a6a1473
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Fix static build
Change-Id: Ifc2ef78694c2b8fe53961cee75371e5431fff9c4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
- QOpenGLEXtensions now private API in GUI
- Removed support for tessellation in GL 3
- Use QMouseEvent position
- Removed use of QDesktopWidget
- Adapt to change in QQuickWindow API
Change-Id: I79df8780b9d02c6d2a3620529f5f41daec7120fe
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
| |
Change-Id: I4ab815079a5fd794714bc5a7cad05e970afcd731
Pick-to: 5.15
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com>
|
|
|
|
|
| |
Change-Id: If507aac8d48cc33fa7acf993ab77b76cdd70ee9a
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
| |
Trying to please CMake CI which crashes on large resources.
Will add back later.
Change-Id: I5b57e9b1326e37624bf209813c4ae7c9a0c6762f
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
|
|
|
|
|
| |
Change-Id: I250de427ffca49d2736c1f01046733df5fb25d6e
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: Ia1dd8d0441f6e6371cec574f7d937d6d94c57186
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
| |
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- updated dependencies, excluding qtgamepad for now
- fixed issues with Q_PROPERTY not supporting forward declarations
- fixed for changes in QtQuick private API
- fixed for changes in QtOpenGLVersionFunctions API
- fixed for removal of QT_OPENGL_ES* macros
- fixed for changes in QtConcurrent API
- fixed RHI based build
Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|\
| |
| |
| | |
Change-Id: Id669d5c1aab29965eac0dabd1cb497e908dac23e
|
| |
| |
| |
| |
| | |
Change-Id: Iba20f047404b20c1e5b9bdcef917b3c2a1000d59
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/renderers/opengl/graphicshelpers/submissioncontext.cpp
src/plugins/renderers/opengl/graphicshelpers/submissioncontext_p.h
src/plugins/renderers/opengl/renderer/renderer.cpp
src/render/backend/attachmentpack_p.h
src/render/frontend/qrenderaspect.cpp
src/render/picking/qabstractraycaster.cpp
tests/manual/manual.pro
Change-Id: I617b7e34bf7e11b2921bfc15e1b99c3e81891ec7
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is already done in Qt3DExtras::Qt3DWindow.
Change-Id: Idf742b93fdc0d8d4226284d6d949758a07921dd5
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I98507808b43b116b1950fd60df54704562a234ce
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When an entity has a bounding QBoundingVolume component AND that has
a QGeometryView, the bounding volume can be computed by the core
aspect and the results get pulled to the render backend.
Otherwise, we use the old code which computes the bounding volume
in the render aspect.
This means we have 2 jobs to compute bounding volumes and that the core
version must complete before the render aspect runs.
Change-Id: I4de45e48fa0c4d40d3d5084f387abfed5ea1a2f8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|