feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qds: use QtQuickEffectMaker app bundle path

Browse Source 
Change-Id: Id267d50007766b2849b71d7ff9393d6de6f9e3c0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit da1ccc2a9adf8244d30f478b566f5f1ceb00b569)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenßen
2023-05-11 10:24:15 +02:00
committed by Tim Jenssen
parent c644f78596
commit 6c5960f723
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -1650,7 +1650,11 @@ void openEffectMaker(const QString &filePath)
const QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(target->kit()); const QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
if (baseQtVersion) { if (baseQtVersion) {
Utils::Environment env = Utils::Environment::systemEnvironment();
auto effectMakerPath = baseQtVersion->binPath().pathAppended("qqem").withExecutableSuffix(); 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()) { if (!effectMakerPath.exists()) {
qWarning() << __FUNCTION__ << "Cannot find EffectMaker app"; qWarning() << __FUNCTION__ << "Cannot find EffectMaker app";
return; return;
@@ -1663,7 +1667,6 @@ void openEffectMaker(const QString &filePath)
arguments << "--create"; arguments << "--create";
arguments << "--exportpath" << effectResPath.toString(); arguments << "--exportpath" << effectResPath.toString();
Utils::Environment env = Utils::Environment::systemEnvironment();
if (env.osType() == Utils::OsTypeMac) if (env.osType() == Utils::OsTypeMac)
env.appendOrSet("QSG_RHI_BACKEND", "metal"); env.appendOrSet("QSG_RHI_BACKEND", "metal");