Merge pull request #14195 from spowelljr/fixNonAppleCode

GUI: Fix build errors in non-Apple code
pull/14196/head
Steven Powell 2022-05-18 20:48:06 -07:00 committed by GitHub
commit 0ca84b6881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions

View File

@ -115,7 +115,7 @@ void AdvancedView::update(Cluster cluster)
#if __linux__ || __APPLE__
sshButton->setEnabled(exists);
#else
basicSSHButton->setEnabled(false);
sshButton->setEnabled(false);
#endif
pauseButton->setText(getPauseLabel(isPaused));
startButton->setText(getStartLabel(isRunning));

View File

@ -71,7 +71,7 @@ void BasicView::update(Cluster cluster)
#if __linux__ || __APPLE__
sshButton->setEnabled(exists);
#else
basicSSHButton->setEnabled(false);
sshButton->setEnabled(false);
#endif
pauseButton->setText(getPauseLabel(isPaused));
startButton->setText(getStartLabel(isRunning));

View File

@ -194,12 +194,14 @@ void CommandRunner::outputReady()
emit output(text);
}
#if __APPLE__
void CommandRunner::setMinikubePath()
{
m_env = QProcessEnvironment::systemEnvironment();
QString path = m_env.value("PATH") + ":/usr/local/bin";
m_env.insert("PATH", path);
}
#endif
void CommandRunner::minikubePath()
{