Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

This commit is contained in:
David Shah 2018-07-17 16:18:13 +02:00
commit f62f04e376

View File

@ -61,6 +61,7 @@ YosysTab::YosysTab(QString folder, QWidget *parent) : QWidget(parent)
connect(process, SIGNAL(readyReadStandardError()), this, SLOT(onReadyReadStandardError())); connect(process, SIGNAL(readyReadStandardError()), this, SLOT(onReadyReadStandardError()));
connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadyReadStandardOutput())); connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadyReadStandardOutput()));
connect(process, &QProcess::started, this, [this] { lineEdit->setEnabled(true); }); connect(process, &QProcess::started, this, [this] { lineEdit->setEnabled(true); });
/*
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
connect(process, &QProcess::error, this, [this](QProcess::ProcessError error) { connect(process, &QProcess::error, this, [this](QProcess::ProcessError error) {
#else #else
@ -73,6 +74,7 @@ YosysTab::YosysTab(QString folder, QWidget *parent) : QWidget(parent)
Q_EMIT deleteLater(); Q_EMIT deleteLater();
} }
}); });
*/
process->setWorkingDirectory(folder); process->setWorkingDirectory(folder);
process->start("yosys"); process->start("yosys");
} }