From 6c5960f723d9e87d1f564d9836ea3776eb9358f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Jen=C3=9Fen?= Date: Thu, 11 May 2023 10:24:15 +0200 Subject: [PATCH] qds: use QtQuickEffectMaker app bundle path Change-Id: Id267d50007766b2849b71d7ff9393d6de6f9e3c0 Reviewed-by: Thomas Hartmann (cherry picked from commit da1ccc2a9adf8244d30f478b566f5f1ceb00b569) Reviewed-by: Tim Jenssen --- .../components/componentcore/modelnodeoperations.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index b8b1fa94e84..918b06c6379 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp @@ -1650,7 +1650,11 @@ void openEffectMaker(const QString &filePath) const QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(target->kit()); if (baseQtVersion) { + Utils::Environment env = Utils::Environment::systemEnvironment(); + auto effectMakerPath = baseQtVersion->binPath().pathAppended("qqem").withExecutableSuffix(); + if (!effectMakerPath.exists() && env.osType() == Utils::OsTypeMac) + effectMakerPath = baseQtVersion->binPath().pathAppended("qqem.app/Contents/MacOS/qqem"); if (!effectMakerPath.exists()) { qWarning() << __FUNCTION__ << "Cannot find EffectMaker app"; return; @@ -1663,7 +1667,6 @@ void openEffectMaker(const QString &filePath) arguments << "--create"; arguments << "--exportpath" << effectResPath.toString(); - Utils::Environment env = Utils::Environment::systemEnvironment(); if (env.osType() == Utils::OsTypeMac) env.appendOrSet("QSG_RHI_BACKEND", "metal");