diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index ffaf34d5e8e..fdda375534a 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -436,7 +436,11 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &w const Utils::Environment &env) { const TerminalCommand term = terminalEmulator(settings); - +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) + // for 5.9 and below we cannot set the environment + return QProcess::startDetached(term.command, QtcProcess::splitArgs(term.openArgs), + workingDir); +#else QProcess process; process.setProgram(term.command); process.setArguments(QtcProcess::splitArgs(term.openArgs)); @@ -444,6 +448,7 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &w process.setWorkingDirectory(workingDir); return process.startDetached(); +#endif } } // namespace Utils diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp index 89b0054f462..d392a670ca5 100644 --- a/src/plugins/projectexplorer/environmentwidget.cpp +++ b/src/plugins/projectexplorer/environmentwidget.cpp @@ -207,8 +207,9 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, QWidget *additionalDetails d->m_terminalButton = new QPushButton(this); d->m_terminalButton->setText(tr("Open &Terminal")); d->m_terminalButton->setToolTip(tr("Open a terminal with this environment set up.")); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) buttonLayout->addWidget(d->m_terminalButton); - +#endif buttonLayout->addStretch(); horizontalLayout->addLayout(buttonLayout); @@ -231,10 +232,8 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, QWidget *additionalDetails this, &EnvironmentWidget::batchEditEnvironmentButtonClicked); connect(d->m_environmentView->selectionModel(), &QItemSelectionModel::currentChanged, this, &EnvironmentWidget::environmentCurrentIndexChanged); - connect(d->m_terminalButton, &QAbstractButton::clicked, this, &EnvironmentWidget::openTerminal); - connect(d->m_detailsContainer, &Utils::DetailsWidget::linkActivated, this, &EnvironmentWidget::linkActivated);