summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation of manual testsPaul Lemire2022-12-191-1/+1
| | | | | | | | | | | | - Disable the examples that use QtMultimedia as they haven't been ported to QtMultimedia from Qt6 - QTextureDataUpdate forward header doesn't seem to be generated - Add QuickWidgets in the find_package call so that we can later check if it is actually available Pick-to: 6.4 6.5 Change-Id: I98d000e839dd0cb0aad862b66bfe8b9725a13744 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: fix build: qtshadertools may be requiredThiago Macieira2022-11-241-1/+1
| | | | | | | | | | | | | | | CMake Error at src/plugins/renderers/rhi/rhi.cmake:7 (target_link_libraries) Error evaluating generator expression: $<TARGET_PROPERTY:Qt6::ShaderTools,_qt_module_has_private_headers> Target "Qt6::ShaderTools" not found. Call Stack (most recent call first): tests/auto/render/rhi/rhi_renderviews/CMakeLists.txt:21 (qt3d_setup_rhi_renderer_target) Pick-to: 6.4 Change-Id: I76216ced393445a4ae2dfffd172a502aec56333b Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-241-1/+1
| | | | | | | 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>
* Add license headers to cmake filesLucie Gérard2022-07-081-0/+3
| | | | | | | | | | | | | 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>
* Fix some compile warningsMike Krus2022-06-031-1/+1
| | | | | | | | | | Mostly unsafe type conversions, and replacing deprecated APIs. Still can't remove the not-clean-build flags because of bug in qtbase. Pick-to: 6.3 Change-Id: I1e305be2cdf52ccd62949c023c999be347810dd5 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add missing Network packageAlexey Edelev2022-02-241-1/+5
| | | | | | | | | | 3DCore depends on Qt::Network, but the Network package is not mentioned as required component. In general case it looks like the package is found as the dependency of other targets. So add it explicitly. Pick-to: 6.2 6.3 Change-Id: I26b298e5254c7d5d03ffcb24794180dbec0fd24d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-221-1/+1
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I29beb4b263c915d3ff5312a3b1ceb45e8fdc34e0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Disable RHI Renderer by defaultMike Krus2021-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* Remove unneeded CMake variable assignmentsJoerg Bornemann2021-06-151-6/+0
| | | | | | | | | | | | Remove assignments to the transitionary variables QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS and QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Both are not needed anymore. Task-number: QTBUG-94444 Change-Id: Ie54f38267a7529e96117e1be2b2bf2164372024f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Disable the audio visualizer example for nowLars Knoll2021-06-071-1/+1
| | | | | | | | 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>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-06-041-0/+3
| | | | | | | 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>
* Don't hardcode version number in CMakeLists.txtLi Xinwei2021-01-131-1/+2
| | | | | | | | | The version number should depend on .cmake.conf. Pick-to: 6.0 Change-Id: I1ef7713d7dbf3ee5f0abdf7f9d8ff0fb89cdb6dc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* Follow up on change of QQmlListProperty to qsizetypeMike Krus2020-11-201-5/+5
| | | | | | | | | Also update dependencies and fix non-gui builds. Disabled (for now) gltf unit test since JSON parser seems to crash. Change-Id: Ie7fdd9626653e89ad43e8bdb22b0e764618b1e9e Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
* CMake: Make optional components that are not found more quietAlexandru Croitor2020-10-201-4/+4
| | | | | | | | Doesn't display a big stack trace warning, instead just saying that the component was not found. Change-Id: I07780f34c865b854573e8acd5399a7a9253d7ff3 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* CMake: Disable usage of CMake API compatibility wrappersAlexandru Croitor2020-10-071-0/+5
| | | | | | | | | | 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: I0be16a3ab0e83da4cc9ee11dc9a9b7572fccea97 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update dependenciesPaul Lemire2020-06-121-1/+1
| | | | | | | | | | | - 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>
* Disable warnings-as-errors globallyMike Krus2020-06-101-0/+5
| | | | | | | See if this makes CI happy Change-Id: I8095e586c3dd4b1081a2c5e3fa1ed470c8f29430 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add support for building with CMakeMike Krus2020-05-221-0/+25
Change-Id: If6c887c6356a160a5f3fb906d38a341fff0c7b29 Reviewed-by: Mike Krus <mike.krus@kdab.com>