Merge branch 'master' into 'master'

Master

See merge request eddiehung/nextpnr!1

3 files changed, 3 insertions, 2 deletions

diff --git a/gui/generic/family.cmake b/gui/generic/family.cmake
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gui/generic/family.cmake
diff --git a/gui/generic/mainwindow.cc b/gui/generic/mainwindow.cc
index fef63094..88e291e6 100644
--- a/gui/generic/mainwindow.cc
+++ b/gui/generic/mainwindow.cc
@@ -23,7 +23,7 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 

 NEXTPNR_NAMESPACE_BEGIN

 

-MainWindow::MainWindow(QWidget *parent) : BaseMainWindow(parent)

+MainWindow::MainWindow(std::unique_ptr<Context> context, QWidget *parent) : BaseMainWindow(std::move(context), parent)

 {

     initMainResource();

 

@@ -31,6 +31,7 @@ MainWindow::MainWindow(QWidget *parent) : BaseMainWindow(parent)
     setWindowTitle(title.c_str());

 

     createMenu();

+    Q_EMIT contextChanged(ctx.get());

 }

 

 MainWindow::~MainWindow() {}

diff --git a/gui/generic/mainwindow.h b/gui/generic/mainwindow.h
index fd9812cd..e97bb4e7 100644
--- a/gui/generic/mainwindow.h
+++ b/gui/generic/mainwindow.h
@@ -29,7 +29,7 @@ class MainWindow : public BaseMainWindow
     Q_OBJECT

 

   public:

-    explicit MainWindow(QWidget *parent = 0);

+    explicit MainWindow(std::unique_ptr<Context> context, QWidget *parent = 0);

     virtual ~MainWindow();

 

   public: