diff options
Diffstat (limited to 'src/Authoring/Qt3DStudio/PreviewHelper.cpp')
| -rw-r--r-- | src/Authoring/Qt3DStudio/PreviewHelper.cpp | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/Authoring/Qt3DStudio/PreviewHelper.cpp b/src/Authoring/Qt3DStudio/PreviewHelper.cpp index 1e87201b..24d7ee91 100644 --- a/src/Authoring/Qt3DStudio/PreviewHelper.cpp +++ b/src/Authoring/Qt3DStudio/PreviewHelper.cpp @@ -118,21 +118,14 @@ QString CPreviewHelper::getViewerFilePath(const QString &exeName) viewerFile = QStringLiteral("%1.exe").arg(exeName); QString viewer = viewerDir.filePath() + QStringLiteral("/") + viewerFile; - if (!QFileInfo(viewer).exists()) { - if (exeName == QLatin1String("q3dsviewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/qt3d-runtime/bin/") - + viewerFile; - } else if (exeName == QLatin1String("Qt3DViewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") - + viewerFile; - } + if (!QFileInfo(viewer).exists() && exeName == QLatin1String("Qt3DViewer")) { + viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") + + viewerFile; } #else #ifdef Q_OS_MACOS QString viewerDevPath; - if (exeName == QLatin1String("q3dsviewer")) - viewerDevPath = QStringLiteral("../src/Runtime/qt3d-runtime/bin/"); - else if (exeName == QLatin1String("Qt3DViewer")) + if (exeName == QLatin1String("Qt3DViewer")) viewerDevPath = QStringLiteral("../src/Runtime/ogl-runtime/bin/"); // Name of the executable file on macOS @@ -155,14 +148,9 @@ QString CPreviewHelper::getViewerFilePath(const QString &exeName) viewerFile = exeName; QString viewer = viewerDir.filePath() + QStringLiteral("/") + viewerFile; - if (!QFileInfo(viewer).exists()) { - if (exeName == QLatin1String("q3dsviewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/qt3d-runtime/bin/") - + viewerFile; - } else if (exeName == QLatin1String("Qt3DViewer")) { - viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") - + viewerFile; - } + if (!QFileInfo(viewer).exists() && exeName == QLatin1String("Qt3DViewer")) { + viewer = viewerDir.filePath() + QStringLiteral("/../src/Runtime/ogl-runtime/bin/") + + viewerFile; } #endif #endif |