Merge branch 'master' into qt-wacom-serial

src/qt/qt_mainwindow.hpp

@@ -141,6 +141,8 @@ private slots:
 private slots:
     void on_actionCursor_Puck_triggered();
 
+    void on_actionACPI_Shutdown_triggered();
+
 private slots:
     void on_actionShow_non_primary_monitors_triggered();