diff options
| author | Inho Lee <inho.lee@qt.io> | 2024-03-06 10:07:07 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-06 12:33:50 +0000 |
| commit | 36a3ca350cfb9f2628921515c09f2f905090e89b (patch) | |
| tree | 7b8a3eb4afeb9eb9fea9eb25a65e92235f6a53af | |
| parent | e9122abb1e97258b828072dfc21ed38668a6c373 (diff) | |
Fix build-failure with no-qml-debug
A dependency on qml_debug was not properly set.
Fixes: QTBUG-123015
Pick-to: 6.6 6.5
Change-Id: I238d538229d86f96a992221037485c23310ac4da
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
(cherry picked from commit aa937e6fb5c20dcd3d5d45d46cf3128f935c8b2c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick3dparticles/qquick3dparticlemodelblendparticle.cpp | 2 | ||||
| -rw-r--r-- | src/runtimerender/qssgrendershadercache.cpp | 4 | ||||
| -rw-r--r-- | src/utils/qquick3dprofiler.cpp | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/quick3dparticles/qquick3dparticlemodelblendparticle.cpp b/src/quick3dparticles/qquick3dparticlemodelblendparticle.cpp index d16ede94..1e2eb2f4 100644 --- a/src/quick3dparticles/qquick3dparticlemodelblendparticle.cpp +++ b/src/quick3dparticles/qquick3dparticlemodelblendparticle.cpp @@ -567,9 +567,11 @@ QSSGRenderGraphObject *QQuick3DParticleModelBlendParticle::updateSpatialNode(QSS QQuick3DObjectPrivate::get(m_model)->spatialNode = spatialNode; Q_QUICK3D_PROFILE_ASSIGN_ID_SG(this, spatialNode); } +#if QT_CONFIG(qml_debug) auto *geometrySpatialNode = QQuick3DObjectPrivate::get(m_modelGeometry)->spatialNode; if (geometrySpatialNode) Q_QUICK3D_PROFILE_ASSIGN_ID_SG(this, geometrySpatialNode); +#endif QSSGRenderModel *model = static_cast<QSSGRenderModel *>(spatialNode); diff --git a/src/runtimerender/qssgrendershadercache.cpp b/src/runtimerender/qssgrendershadercache.cpp index a4456e68..b5a2e827 100644 --- a/src/runtimerender/qssgrendershadercache.cpp +++ b/src/runtimerender/qssgrendershadercache.cpp @@ -532,7 +532,11 @@ QSSGRhiShaderPipelinePtr QSSGShaderCache::newPipelineFromPregenerated(const QByt qDebug("Loading of vertex and fragment stages succeeded"); } +#if !QT_CONFIG(qml_debug) + Q_UNUSED(obj); +#else Q_QUICK3D_PROFILE_END_WITH_ID(QQuick3DProfiler::Quick3DLoadShader, 0, obj.profilingId); +#endif QSSGShaderCacheKey cacheKey(inKey); cacheKey.m_features = inFeatures; diff --git a/src/utils/qquick3dprofiler.cpp b/src/utils/qquick3dprofiler.cpp index 07a270f2..2de70ba2 100644 --- a/src/utils/qquick3dprofiler.cpp +++ b/src/utils/qquick3dprofiler.cpp @@ -3,7 +3,6 @@ #include "qquick3dprofiler_p.h" -#include <QtQml/private/qqmlabstractprofileradapter_p.h> #include <QtQml/qqmlfile.h> #include <QtCore/qcoreapplication.h> @@ -11,6 +10,8 @@ QT_BEGIN_NAMESPACE +#if QT_CONFIG(qml_debug) + // Enable to debug profiling without client app. //#define PROFILE_WITHOUT_CLIENT @@ -132,4 +133,5 @@ void QQuick3DProfiler::setTimer(const QElapsedTimer &t) m_timer = t; } +#endif QT_END_NAMESPACE |