From c00485d9a29d9d5d5546ad42bf39363fce9d0793 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 14 Oct 2024 15:59:23 +0300 Subject: [PATCH] QmlDesigner: Fix Image elements in composed effects when no image source If image source is empty, we still need to generate the Image element for the effect, as user may set the image source later via effect properties. Change-Id: I3a7641f144f6be78062d24e8219064d050d0e471 Reviewed-by: Mahmoud Badri --- src/plugins/effectcomposer/effectcomposermodel.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/effectcomposer/effectcomposermodel.cpp b/src/plugins/effectcomposer/effectcomposermodel.cpp index 673c6c62b70..926bd948bbb 100644 --- a/src/plugins/effectcomposer/effectcomposermodel.cpp +++ b/src/plugins/effectcomposer/effectcomposermodel.cpp @@ -1403,8 +1403,6 @@ QString EffectComposerModel::valueAsVariable(const Uniform &uniform) // Return name for the image property Image element QString EffectComposerModel::getImageElementName(const Uniform &uniform, bool localFiles) { - if (localFiles && uniform.value().toString().isEmpty()) - return QStringLiteral("null"); QString simplifiedName = uniform.name().simplified(); simplifiedName = simplifiedName.remove(' '); return QStringLiteral("imageItem") + simplifiedName; @@ -1925,11 +1923,7 @@ QString EffectComposerModel::getQmlImagesString(bool localFiles) for (Uniform *uniform : uniforms) { if (uniform->type() == Uniform::Type::Sampler) { QString imagePath = uniform->value().toString(); - // For preview, generate image element even if path is empty, as changing uniform values - // will not trigger qml code regeneration if (localFiles) { - if (imagePath.isEmpty()) - continue; QFileInfo fi(imagePath); imagePath = fi.fileName(); imagesString += QString(" property url %1Url: \"%2\"\n")