| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
| |
QSequentialIterable is deprecated.
Task-number: QTBUG-140181
Change-Id: I0990caa8c455352b850d482689d841ecfc8b2ac5
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Q_ENUM does what Q_ENUMS did plus declaring two friend functions, so the
behavior should be the same.
Q_ENUMS has been deprecated since at least Qt 6.
Pick-to: 6.10 6.8 6.5
Change-Id: I9ff5e5268e6871cbe1e7c2dc69b1c4bd25686540
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
|
| |
|
|
|
|
|
|
|
| |
We already silence a function-type cast warning on gcc, but clang also
emits a similar warning.
Pick-to: 6.8 6.9 6.10
Change-Id: I5f2d68da0402aeebe4edb24db717300b8cd9af31
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
|
| |
|
|
|
|
|
|
| |
Adding alt texts that were needed for QDoc
Pick-to: 6.10
Change-Id: I46e6337dd4a4b5ac954a17a3f771f975a3ab2680
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
|
| |
|
|
|
|
| |
Task-number: QTBUG-140629
Change-Id: I7aa3d05592e984c6272dff3510d7153815ba9494
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
A number of warnings can be seen in the build log where QDoc cannot
generate a topic (typically, a function doc) because it's a member of
a class that is not documented. Majority of these cases are for members
of internal classes that were never marked as \internal.
Since the module is deprecated and adding internal \class topics would
not change the output generated by QDoc, simply suppress the warning
category entirely to reduce the noise during a build.
Change-Id: Ia329fe895d34b986257328d97adb46428c2191e3
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
| |
The 3DCorePrivate module should not be linked publicly.
The 3DLogic linkage should be prepended with the Qt:: namespace.
Pick-to: 6.8 6.10
Change-Id: I6c8c77167250a95a2c0ccc56fe3c1aca93eba9a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise the linker tries to find
Qt3DExtras::Quick::qInitResources_extra
instead of a plain
qInitResources_extra
which leads to an undefined symbol error with a static Qt build.
Amends 5e4888945d534b280aa7f618609a514ebd77783f
Pick-to: 6.8 6.10
Fixes: QTBUG-140939
Change-Id: I4b34103f709ee05347e78478c11d4033eedd30b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
QString.arg() does not accept QFlags anymore. Converting to int
explicitly
Compare: 0a1c69bba5b5dd26b937ac0a67ab0bdd1c32b221
Fixes: QTBUG-141068
Pick-to: 6.10
Change-Id: I07a737e17a15869860d227d91dff5d3a71389bd1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
|
|
|
|
| |
Pick-to: 6.10 6.9 6.8
Change-Id: I4ee0a3b192d943389d477675b41f8781433a151e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
This commit enables the documentation for the Scene3D module.
The required documentation entry was missing in .qdocconf.
Fixes: QTBUG-138670
Pick-to: 6.10 6.9 6.8
Change-Id: I38c71bf0e0c9cf5f89c8c9a2021ff2451930a16c
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
| |
Pick-to: 6.10 6.10.0
Fixes: QTBUG-139978
Change-Id: Ie636cba5b932ad35da18dfdab2feeaab96579621
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The target is a bare library created with add_library(), and then uses
qt_internal_extend_target to add some attribution info.
This will break with a future qtbase that will try to generate an SBOM
for any target that adds any kind of sbom info, but doesn't provide an
SBOM TYPE.
qtbase SBOM support doesn't offer a good type for this kind of target
yet, so to work around it, we set the SBOM TYPE to CUSTOM for now.
Pick-to: 6.8 6.9 6.10
Task-number: QTBUG-134894
Change-Id: Ibd9101e6949c2f3d551927fa1523e8204a9cb249
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
This is required to stay compatible with older versions with manually
written plugin sources.
Amends commit b559603cd09f724838cfe6ba9639cfe5957b727e
Pick-to: 6.10 6.9 6.8
Change-Id: I2f6e52e7fcdd61de25f1d174ce679965ac83d9dc
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
|
|
|
|
|
|
| |
[ChangeLog][Third-Party Code] Update ASSIMP to 6.0.2
Change-Id: I791680ad92cbbd3332c48fb5775a7b89bf808ea4
Pick-to: 6.10 6.9 6.8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The \generatelist command takes an optional argument
that affect how the members are listed, for example,
`classesbymodule` which creates an annotated list of
the classes in a named C++ module.
`groupsbymodule` is not recognized or documented. QDoc
falls back to generating a list of all members of a
group in this case. While the end result is correct,
this relies on an undocumented feature that is likely
to change and break.
Replace these instances with an explicit \annotatedlist
command that produces the same output.
Pick-to: 6.10
Task-number: QTBUG-138901
Change-Id: I10e54f01c473a014e9e1a15cf3bf6489f2123178
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
If the user code adds a new child to that list, it can detach
the list, and then the range-for is iterating over deleted memory.
This code was initially using Q_FOREACH which did exactly this,
the crash is a pitfall of the port to range-for
Pick-to: 6.10 6.9 6.8
Change-Id: Ic5a1e099766d359c35a17eb4fdfd78a9d8152cc1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
In the case of using a QRenderController, a dummy surface was used to
avoid messing about with the compositor. This is no longer needed due
to 6.X changes and was causing issues with compositing on macOS
Pick-to: 6.10 6.9 6.8
Ticket-number: QTBUG-127771
Change-Id: I072d44ad4bb2bf9fd48935d06dac6b4aff70fb45
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
|
|
| |
getV4Engine() has been removed.
Fixes: QTBUG-137866
Change-Id: I882727cbe07a1355e1de9d5f51ebbcb39acb3d66
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
| |
|
|
|
|
|
| |
Fixes: QTBUG-135394
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I44193fc6b064cb93c2652978cb5e76004cd03c64
Reviewed-by: Inho Lee <inho.lee@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
This is the result of running util/normalize on the code base. The
following manual edits were needed:
- folded two long connect() lines
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: If3dfd251cacdb1e47b8a98a1fc9462d16fec3e11
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
[ChangeLog][Third-Party Code] Added PURL and CPE information to the
attribution files of 3rd party sources.
Pick-to: 6.5 6.8 6.9 6.10
Fixes: QTBUG-137381
Task-number: QTBUG-129602
Change-Id: Ib421f50fa0dc1dd2f4a863db37565ac2c874c485
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
Since 6.10, QDoc is capable of generating links to the declaration in
the source code for each documented C++ API entity in their `Detailed
description`.
Add the required configuration to enable this feature in Qt 3D.
Change-Id: Id5f51f1a8700d3d96fd0d8d2d6a8b11d6329b094
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Unlike the other shader versions. This resulted in each glyph being placed
deeper and deeper into the scene.
Pick-to: 6.9 6.8
Change-Id: I173b6dd8c4af57728566e4f4cff473936aa24b54
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Amends be9ef64a8fcaae548321dccfeb9ece29eb007550 that introduced the
declarative type registration but didn't delete the qmltypes file. Also
delete the dependencies.json file and add the missing dependency in the
qt_add_qml_module call.
This seems to be the last qt3d type registration fix, at least I can't
produce any qmllint warnings anymore by using qml types from:
* QtQuick.Scene3D
* QtQuick.Scene2D
* Qt3D.Logic
* Qt3D.Core
* Qt3D.Extras
* Qt3D.Input
* Qt3D.Animation
* Qt3D.Render
Pick-to: 6.8 6.9
Fixes: QTBUG-106079
Change-Id: I9f63de123eb1a78e300e59a6d7edf4a2d75261b4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add declarative qml registration via QML_FOREIGN, remove handwritten(?)
qmldir and qmltypes files. Keep the manually written plugin around for
the special initialization it does.
Replace the dependencies.json with a DEPENDENCIES in the
qt_add_qml_module call.
This fixes some qmllint warnings about the handwritten *.qmltypes files
being outdated and/or invalid.
Pick-to: 6.8 6.9
Task-number: QTBUG-106079
Change-Id: Iefca84ad610cddfcdb47eb50e591efccc00407bd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add declarative qml registration via QML_FOREIGN, remove handwritten(?)
qmldir and qmltypes files. Also remove the .pro files, but keep the manually
written plugin for the special registration it does. Change the
CMakeLists.txt to have the plugin code separate from the QML Module code
to avoid weird interferences between qmltyperegistrar and the plugin.
Also fix the REVISION macros to include the major version.
Replace the dependencies.json with a DEPENDENCIES in the
qt_add_qml_module call.
Also remove the .qrc files that only refers non-existing qml files, it
seems to be a leftover from something. Also remove the plugin code that
was loading this .qrc file.
Also do the qtquickplugin.cpp dance to avoid evil linker optimizations in
static builds.
This fixes some qmllint warnings about the handwritten *.qmltypes files
being outdated and/or invalid.
Pick-to: 6.8 6.9
Task-number: QTBUG-106079
Change-Id: Iefeffc58137f5f8ef6958b33d4199c66f9dbe906
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the imports/logic folder with a QML module living at
quick3dlogic (to follow the naming used by the other QML modules in
quick3d) and do declarative qml registration via QML_FOREIGN,
remove handwritten(?) qmldir and qmltypes files.
Also remove the .pro files, and the manually written plugin that was
only used for imperative type registration.
Also fix the REVISION macros to include the major version.
Replace the dependencies.json with a DEPENDENCIES in the
qt_add_qml_module call.
This fixes some qmllint warnings about the handwritten *.qmltypes files
being outdated and/or invalid.
Pick-to: 6.8 6.9
Task-number: QTBUG-106079
Change-Id: Ib500008cd817032deb8e15cde5f6ca24aad9c11f
Reviewed-by: Ulf Hermann <ulf.hermann@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>
|
| |
|
|
|
|
|
|
|
|
| |
The textureSize uniform was renamed to textureWidth. However, only the RHI shader
was updated, the ES2 and GL3 shaders were not leading to incorrect rendering
Task-number: QTBUG-124708
Pick-to: 6.9 6.8 6.8.3
Change-Id: Ia80a76e9ac07025ac0005802ea7b3c36a20b6636
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
|
|
|
|
|
|
|
|
| |
QDoc now warns about unrecognized QML base types passed to
the \inherits command. Fix these issues.
Pick-to: 6.9 6.8
Change-Id: I355ca280deca75c8434c36e46a5fd666751adb72
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: David Boddie <david.boddie@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
QDoc now warns about C++ types in QML property documentation.
This change fixes existing documentation to prevent warnings.
Pick-to: 6.8
Fixes: QTBUG-133931
Change-Id: Ia765b96ee7a08e95ee6b7f01e04fea1b49c14fc2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Avoid copies of the buffer in the update batch, move the data instead.
Change-Id: I8a44b8a6e65846024d71956e9b4d3d7d7d4747b0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
| |
Pick-to: 6.8 6.9
Change-Id: I0380dd996088d2f0ae3e7d20e09b64aab13b9424
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Explicitly include QHash.
This is needed to fix the build after a change in qtbase that removes
`#include <qdebug.h>` from some public/private Qt headers.
Pick-to: 6.9
Change-Id: I27d79850c204d43b5b20cdae38331d9d3988d847
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |
|
|
|
|
|
|
|
| |
This will prevent qdoc from reporting about an unknown base type.
Task-number: QTBUG-131459
Pick-to: 6.8 6.9
Change-Id: Ib47e217c7fc549eb03954d69eb34d601a73e65e3
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Fixes warnings after QFile::open has become [[nodiscard]].
In one case, replace the check for file existence with the check for the
file's opening success. That's the whole reason we added the
[[nodiscard]] for.
Pick-to: 6.9 6.8
Change-Id: Ib6fe8c2ac3b9306bbe74bc70ba36f19efbdcbe7d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
| |
|
|
|
|
|
|
|
| |
They're not all, I believe, but it's what I saw fly by while trying to
make Qt3D compile with unity-build batch-size of 0 (= ∞).
Pick-to: 6.9 6.8
Change-Id: Ia29191c03aa9567131fd85c67d9647261acc5922
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |
|
|
|
|
|
|
|
|
| |
This prepares the code for QObject::d_ptr to become a unique_ptr
instead of a QScopedPointer.
Pick-to: 6.9 6.8
Task-number: QTBUG-132213
Change-Id: I0da2efb11f21c64c2747f9ff554d83391232dc15
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Exclude the imgui files from PCH (and therefore Unity) builds. In
unity builds, they were observed to hit the
#error Please '#define IMGUI_DEFINE_MATH_OPERATORS' _BEFORE_ including imgui.h!
in imgui.h. But these files define some macros before they include
headers, so PCH should also be affected, thus use NO_PCH_SOURCES.
Create a variable to DRY the lists for SOURCES and NO_PCH_SOURCES.
Amends 01b416a07c49ba15f2d0a65712d38f300b763803.
Pick-to: 6.9 6.8 6.5
Change-Id: Ic2a23a50a1d6fa6792262dd16f0acf5dc0e51a51
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Exclude two more files (mentioning what their problems are in
comments, so the next guy has an idea how to fix it).
Pick-to: 6.9 6.8 6.5
Change-Id: I5723773ceb82b731a61f8e13052b88be4538d345
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The qNodeIdTypeId name is also used in materialsystem/shaderdata.cpp.
Use get_if() instead, which implicitly performs the check the old code
was doing explicitly. Then we don't need the qMetaTypeId<QNodeId>()
anymore.
As a drive-by, scope a variable closer (in an if condition).
Amends db4de3f44a9011ae644c7d2ea10ec2394ff7f6f0.
Pick-to: 6.9 6.8 6.5
Change-Id: I2d17384337c927f754e9c2231bd6314114c1d626
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GCC doesn't like the use of a struct in the unnamed namespace in a
struct that's outside said namespace:
updateworldtransformjob.cpp:60:39: error: ‘Qt3DRender::Render::UpdateWorldTransformJobPrivate’ has a field ‘QList<Qt3DRender::Render::{anonymous}::TransformUpdate> Qt3DRender::Render::UpdateWorldTransformJobPrivate::m_updatedTransforms’ whose type has internal linkage [-Werror=subobject-linkage]
60 | class Q_3DRENDERSHARED_PRIVATE_EXPORT UpdateWorldTransformJobPrivate : public Qt3DCore::QAspectJobPrivate
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I don't know whether it's GCC 14, C++23, or unity-builds that cause
this warning, and I don't have the resources to do a differential
analysis on it, sorry, so picking to all relevant branches.
Fix by moving the struct out of the unnamed namespace. There is no
other use of the name anywhere in qt3d, so the unnamed namespace
wasn't necessary to begin with.
Amends 48ff8579fe5643e2b194669bff2c12e69e00053e.
Pick-to: 6.9 6.8 6.5 5.15
Change-Id: I448da205e27f1fe3acc26db515d00ba2cddc53df
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Commit contains fixes for QT_DEPRECATED_SINCE,
mimetype, desktopservices, qt3d_render and wheelevent features
Task-number: QTBUG-122999
Change-Id: I09dfb8969d5831da2b7eb6f2494d2e2fd36cd83e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
|
|
|
| |
Was leading to asserts when initializing the KeyMap which might be
due to changes made in the enum values for the Keys with latest imgui.
Pick-to: 6.9 6.8
Change-Id: Ibb6898f724470e117567fb528de7eada7fc08a66
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
|
|
|
|
|
|
|
|
| |
A return statement in the function that unpins previously used image units
leads to an early exit, even if there are image units left to unpin.
The return statement was removed to fix the issue.
Pick-to: 6.9 6.8 6.7
Change-Id: Ic26f7a9eb418003542c3513ef54c0e1d6c11748a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
| |
|
|
|
|
|
|
|
| |
To the vectors holding the currently running clips.
Task-number: QTBUG-130490
Pick-to: 6.9 6.8
Change-Id: I3ccb742863ae8ee1d179c87ae6cc0d271e975548
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
|
|
|
|
|
|
|
|
| |
- Fix interpolation mode not being set correctly
- Properly deduce buffers to resolve based on input attachment point
Task-number: QTBUG-130470
Pick-to: 6.9 6.8
Change-Id: If072a62cd7b7123b45c37a6f32f8f34334fc43ae
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
When transforming, we must also update the distance since it might be
impacted by the transform.
[ChangeLog][Qt3D][QRay3D] Fix QRay3D::transform
Task-number: QTBUG-132092
Pick-to: 6.9 6.8
Change-Id: Id81f64487ef84b906574ddef41025ee8c203d455
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|