diff options
| author | Tim Jenßen <tim.jenssen@qt.io> | 2023-05-11 10:24:15 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-05-11 09:22:42 +0000 |
| commit | 12d9a31f17a30f47d49757cea5504c7fdbeb8626 (patch) | |
| tree | 85b5616d198fd25fb2ab1585cd687282b69c9f13 | |
| parent | a6ba2354ccaf5858b7fe681c51ffdd33c33d85c4 (diff) | |
| download | qt-creator-12d9a31f17a30f47d49757cea5504c7fdbeb8626.tar.gz | |
qds: use QtQuickEffectMaker app bundle path
Change-Id: Id267d50007766b2849b71d7ff9393d6de6f9e3c0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp index b8b1fa94e8..918b06c637 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"); |