diff options
| author | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-18 04:49:50 +0000 |
|---|---|---|
| committer | Eddie Hung <eddie.hung+gitlab@gmail.com> | 2018-07-18 04:49:50 +0000 |
| commit | 7e6332735d12f2e5ab9128648ed444bc123df512 (patch) | |
| tree | fc4f7a05be8691340c0003e10be400dc67defea0 /gui | |
| parent | dabc057da94207c1dfbb8d9679c639ff697bea14 (diff) | |
| parent | edf7bd09cf2a27fa1ada1a1e34cbe47c4bf0d48a (diff) | |
| download | nextpnr-7e6332735d12f2e5ab9128648ed444bc123df512.tar.gz nextpnr-7e6332735d12f2e5ab9128648ed444bc123df512.tar.bz2 nextpnr-7e6332735d12f2e5ab9128648ed444bc123df512.zip | |
Merge branch 'master' into 'master'
Master
See merge request eddiehung/nextpnr!3
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/yosystab.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gui/yosystab.cc b/gui/yosystab.cc index d83b969e..9bbd9c12 100644 --- a/gui/yosystab.cc +++ b/gui/yosystab.cc @@ -61,9 +61,9 @@ YosysTab::YosysTab(QString folder, QWidget *parent) : QWidget(parent) connect(process, SIGNAL(readyReadStandardError()), this, SLOT(onReadyReadStandardError()));
connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(onReadyReadStandardOutput()));
connect(process, &QProcess::started, this, [this] { lineEdit->setEnabled(true); });
-/*
+
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
- connect(process, &QProcess::error, this, [this](QProcess::ProcessError error) {
+ connect(process, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), this, [this](QProcess::ProcessError error) {
#else
connect(process, &QProcess::errorOccurred, this, [this](QProcess::ProcessError error) {
#endif
@@ -74,7 +74,6 @@ YosysTab::YosysTab(QString folder, QWidget *parent) : QWidget(parent) Q_EMIT deleteLater();
}
});
-*/
process->setWorkingDirectory(folder);
process->start("yosys");
}
|