qmatrix4x4.h will lose its qquaternion.h include, so include
qquaternion.h explicitly in all files that mention 'QQuaternion',
unless, for a foo.cpp, the own foo.h has already included it.
Picking all the way back, even though the include removal won't be
picked as far back, because it's the correct thing to do and cannot
fail.
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I417307626f61b47f694b18424f8c2941f7b8a31c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This includes:
- turning VERIFY_SOURCE_SBOM ON
- adding rules to the licenseRule.json files
- correcting the licensing given via REUSE.toml files
- renaming license files not located in LICENSES folder.
Their name needs to be prefixed with `LICENSE.` to be ignored
by reuse and excluded from the source SBOM. The names are
updated in the corresponding qt_attribution.json
A lot of files are skipped during the license test,
but all are present in the source SBOM.
This is why corrections are needed before turning the
source SBOM check on.
[ChangeLog][Third-Party Code] Renaming the license files with prefix
LICENSE. to have them ignored by reuse tool.
Task-number: QTBUG-131434
Pick-to: 6.9 6.8
Change-Id: I98c2f13d06f32d10829351cbadd76db51c3c27b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
REUSE.toml files are read by reuse to complement or override the
copyright and licensing information found in file.
The use of REUSE.toml files was introduced in REUSE version 3.1.0a1.
This reuse version is compatible with reuse specification
version 3.2 [1].
With this commit's files,
* The SPDX document generated by reuse spdx conforms to SPDX 2.3,
* The reuse lint command reports that the Qt project is reuse compliant.
In order to be reuse compliant all the licenses referenced in file
or within a REUSE.toml file must be present in the LICENSES
directory at the base of the module.
The missing licenses are added.
[1]: https://reuse.software/spec-3.2/
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Pick-to: 6.8
Change-Id: If07497860c819b00169a349edde641a29a5ef259
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
According to QUIP-18 [1], all examples and snippets files should be
LicenseRef-Qt-Commercial OR BSD-3-Clause
[1]: https://contribute.qt-project.org/quips/18
Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: I34b4d6d4a5a6715fb270a916ac7c19c3a09b27d9
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Fixes
qt.qml.context: qrc:/BasicCamera.qml:14:5 Parameter "aspectRatio" is not declared. Injection of parameters into signal handlers is deprecated. Use JavaScript functions with formal parameters instead.
Pick-to: 6.5 6.6
Change-Id: I51f8e912c41c96fdd10c9fe633ec2be3e52a8ecc
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
The \quotefromfile command is smart enough to keep the left indentation
from the source file when it renders the code in a code snippet in a
qdoc file. This is all good when you're listing multiple code snippets
and you can clearly see the left-most-aligned code, or 'starting
point'. However, when you use \quotefromfile for a single code snippet
that is indented in the source file, the rendered code in the qdoc file
is not left-aligned - and this looks a bit odd.
Pick-to: 6.5 6.4 6.2
Change-Id: Ie6d2445b37faa4a75749d6013001892de012a1ef
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Can toggle underlay mode from main.cpp.
Pick-to: 6.5
Change-Id: Id3ef156b0df9b30dd9d7d3620a2878e70434d69b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reduces the maintenance burden.
Also fixed a few issues when moving code.
Pick-to: 6.5
Change-Id: I647f0c1a215f27a0e834d328ca64cfb570639b04
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Those are left overs from the Qt 5.15 to Qt 6 port. Now that both
code based have diverged, there's no much point in keeping those
checks.
Pick-to: 6.5
Change-Id: I4e83876b6b4cb18b181af32e376f4411054a1183
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Pick-to: 6.2 6.4
Fixes: QTCREATORBUG-27852
Change-Id: Icc10aa51f54a7ff19dcff2349048b436f273d6bf
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
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>
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>
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I8105424281eed871037fa6c463871ca8829876b5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
These are leftovers from the qmake conversion.
Pick-to: 6.3
Change-Id: Id80e21ed99bd67b1d05586f596a9585526d47e7e
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
- 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>
qt_examples_build_begin needs the EXTERNAL_BUILD flag
to know that it's safe to build examples as ExternalProjects.
It still won't do it in CI until we enable building
examples as ExternalProjects for prefix builds.
This is preparation for that.
Pick-to: 6.2 6.3
Task-number: QTBUG-90820
Change-Id: I7bd1fdddfba2b87280ebe8bc0762746ade8da468
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Update CMake project files for examples that use
exampleresources/textures.qrc to use big resources. This avoids too
much memory load on the compiler process.
Pick-to: 6.2 6.3
Fixes: QTBUG-100201
Change-Id: Iba933361f66ccb459f6fd1b36774748117b9655c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Also remove an unused macro, as well as the one that was used.
Change-Id: I230c6ffded0a6db7e25c0a6b8f3f82bf583f4005
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Public modules shouldn't propagate private modules as usage
requirements.
Pick-to: 6.2
Fixes: QTBUG-93428
Change-Id: Ic7aca0e8a6469604722596782e87d92d7e510e9e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
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>
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 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>
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>
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>
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>
- 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>
Marc Mutz
Lucie Gérard
Topi Reinio
Mats Honkamaa
Kai Köhne
Mike Krus
Andreas Eliasson
Paul Lemire
Tomi Korpipaa
Alexandru Croitor
Joerg Bornemann
Assam Boudjelthia
Edward Welbourne
Lars Knoll