Commit d884e947 authored by Vincent Pinon's avatar Vincent Pinon

fix wrong previous commit (missed changes, doesn't compile)

parent 021437c6
...@@ -50,15 +50,15 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath) ...@@ -50,15 +50,15 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath)
if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = KdenliveSettings::mltpath(); if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = KdenliveSettings::mltpath();
#endif #endif
//try to automatically guess MLT path if installed with the same prefix as kdenlive with default data path //try to automatically guess MLT path if installed with the same prefix as kdenlive with default data path
if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = qApp->applicationDirPath() + QStringLiteral("/../share/mlt/profiles/"); if (profilePath.isEmpty() || !QFile::exists(profilePath)) profilePath = QDir::cleanPath(qApp->applicationDirPath() + QStringLiteral("/../share/mlt/profiles/"));
//fallback to build-time definition //fallback to build-time definition
if ((profilePath.isEmpty() || !QFile::exists(profilePath)) && !QStringLiteral(MLT_DATADIR).isEmpty()) profilePath = QStringLiteral(MLT_DATADIR) + QStringLiteral("/profiles/"); if ((profilePath.isEmpty() || !QFile::exists(profilePath)) && !QStringLiteral(MLT_DATADIR).isEmpty()) profilePath = QStringLiteral(MLT_DATADIR) + QStringLiteral("/profiles/");
KdenliveSettings::setMltpath(profilePath); KdenliveSettings::setMltpath(profilePath);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QStringLiteral exeSuffix(".exe"); QString exeSuffix = ".exe";
#else #else
const QStringLiteral exeSuffix(); QString exeSuffix = "";
#endif #endif
QString meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt") + exeSuffix; QString meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt") + exeSuffix;
if (!QFile::exists(meltPath)) meltPath = QDir::cleanPath(profilePath + QStringLiteral("../../../bin/melt") + exeSuffix); if (!QFile::exists(meltPath)) meltPath = QDir::cleanPath(profilePath + QStringLiteral("../../../bin/melt") + exeSuffix);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment