EffectComposer: Shorten the generated effect path

Changed "ComposedEffects" to "Effects".

Task-number: QDS-12629
Change-Id: I45e2fd8443af72531d3c3e80f32227eacb948d26
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-04-30 16:09:34 +03:00
parent 6cc8c13c7c
commit cae233f5db
2 changed files with 3 additions and 2 deletions

View File

@@ -116,7 +116,8 @@ bool GeneratedComponentUtils::isImport3dPath(const QString &path) const
bool GeneratedComponentUtils::isComposedEffectPath(const QString &path) const
{
return path.contains(Constants::OLD_EFFECTS_IMPORT_FOLDER)
|| path.contains('/' + QLatin1String(Constants::COMPOSED_EFFECTS_TYPE));
|| path.contains(QLatin1String(Constants::GENERATED_COMPONENTS_FOLDER) + '/'
+ QLatin1String(Constants::COMPOSED_EFFECTS_TYPE));
}
QString GeneratedComponentUtils::generatedComponentTypePrefix() const

View File

@@ -95,7 +95,7 @@ inline constexpr char OLD_EFFECTS_FOLDER[] = "Effects";
inline constexpr char OLD_COMPONENT_BUNDLES_TYPE[] = "ComponentBundles";
inline constexpr char OLD_COMPONENT_BUNDLES_MATERIAL_BUNDLE_TYPE[] = "MaterialBundle";
inline constexpr char OLD_COMPONENT_BUNDLES_EFFECT_BUNDLE_TYPE[] = "EffectBundle";
inline constexpr char COMPOSED_EFFECTS_TYPE[] = "ComposedEffects";
inline constexpr char COMPOSED_EFFECTS_TYPE[] = "Effects";
inline constexpr char MATERIAL_LIB_ID[] = "__materialLibrary__";
inline constexpr char MIME_TYPE_ITEM_LIBRARY_INFO[]