Merge pull request #692 from glowiak/patch-6

This commit is contained in:
Sefa Eyeoglu 2022-06-01 17:46:12 +02:00
parent 938f222791
commit 7a5a1a9af7
No known key found for this signature in database
GPG Key ID: C10411294912A422
2 changed files with 2 additions and 2 deletions

View File

@ -93,7 +93,7 @@ void UpdateController::installUpdates()
qDebug() << "Installing updates."; qDebug() << "Installing updates.";
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QString finishCmd = QApplication::applicationFilePath(); QString finishCmd = QApplication::applicationFilePath();
#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD) #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME); QString finishCmd = FS::PathCombine(m_root, BuildConfig.LAUNCHER_NAME);
#elif defined Q_OS_MAC #elif defined Q_OS_MAC
QString finishCmd = QApplication::applicationFilePath(); QString finishCmd = QApplication::applicationFilePath();

View File

@ -52,7 +52,7 @@ QString MCEditTool::getProgramPath()
#else #else
const QString mceditPath = path(); const QString mceditPath = path();
QDir mceditDir(mceditPath); QDir mceditDir(mceditPath);
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
if (mceditDir.exists("mcedit.sh")) if (mceditDir.exists("mcedit.sh"))
{ {
return mceditDir.absoluteFilePath("mcedit.sh"); return mceditDir.absoluteFilePath("mcedit.sh");