| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
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.
(manual pick from dev as 6.4 was missing)
Task-number: QTBUG-102883
Change-Id: I788f9ccd84bb885e9bc7cb785486a657a6d4ec4e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Remove # generated from xyz.pro comment from pro2cmake
- Remove "# special case" markers for pro2cmake
- Remove automatic use of CMAKE_AUTORCC
- Only opt into CMAKE_AUTOUIC if .ui files are involved
- Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR
- Combine multiple find_package(Qt6 ... calls)
- use REQUIRED COMPONENTS
- sort components alphabetically
- Fix wrong indentations
- Use (only) one empty line after multi-line commands
Pick-to: 6.3
Change-Id: I42cb1788cd53082f71f6a67446dc94f502497dca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
| |
Pick-to: 6.2
Task-number: QTBUG-95636
Change-Id: I2ae5ba6164cb5ed450c8924d484d30167461c10d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Pick-to: 6.1 6.2
Change-Id: I0bff7523e159b800734b58bfef37e5088d0a0d41
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
| |
Pick-to: 6.1
Change-Id: Ic123a704f904096e112b5bdece167800dfc295bb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-87661
Change-Id: I594521a2b9aada164d684b8ef6ce71c730bfb64a
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|