From 80886e66f80a211d63b3a54b98b9f618b051c75b Mon Sep 17 00:00:00 2001 From: inspuration Date: Thu, 12 Jun 2014 14:41:26 -0400 Subject: [PATCH] QT: update ui_main.h to fix travis build --- src/citra_qt/ui_main.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/citra_qt/ui_main.h b/src/citra_qt/ui_main.h index 04979e5ab..295059b5b 100644 --- a/src/citra_qt/ui_main.h +++ b/src/citra_qt/ui_main.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'main.ui' ** -** Created by: Qt User Interface Compiler version 4.8.5 +** Created by: Qt User Interface Compiler version 4.8.6 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -35,6 +35,7 @@ public: QAction *action_About; QAction *action_Popout_Window_Mode; QAction *action_Hotkeys; + QAction *action_Key_Bindings; QAction *action_Configure; QWidget *centralwidget; QHBoxLayout *horizontalLayout; @@ -76,6 +77,8 @@ public: action_Popout_Window_Mode->setCheckable(true); action_Hotkeys = new QAction(MainWindow); action_Hotkeys->setObjectName(QString::fromUtf8("action_Hotkeys")); + action_Key_Bindings = new QAction(MainWindow); + action_Key_Bindings->setObjectName(QString::fromUtf8("action_Key_Bindings")); action_Configure = new QAction(MainWindow); action_Configure->setObjectName(QString::fromUtf8("action_Configure")); centralwidget = new QWidget(MainWindow); @@ -112,6 +115,7 @@ public: menu_Emulation->addAction(action_Stop); menu_Emulation->addSeparator(); menu_Emulation->addAction(action_Configure); + menu_Emulation->addAction(action_Key_Bindings); menu_View->addAction(action_Popout_Window_Mode); menu_View->addAction(action_Hotkeys); menu_Help->addAction(action_About); @@ -135,6 +139,7 @@ public: action_About->setText(QApplication::translate("MainWindow", "About Citra", 0, QApplication::UnicodeUTF8)); action_Popout_Window_Mode->setText(QApplication::translate("MainWindow", "Popout window", 0, QApplication::UnicodeUTF8)); action_Hotkeys->setText(QApplication::translate("MainWindow", "Configure &Hotkeys ...", 0, QApplication::UnicodeUTF8)); + action_Key_Bindings->setText(QApplication::translate("MainWindow", "Set Key Bindings", 0, QApplication::UnicodeUTF8)); action_Configure->setText(QApplication::translate("MainWindow", "Configure ...", 0, QApplication::UnicodeUTF8)); menu_File->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8)); menu_Emulation->setTitle(QApplication::translate("MainWindow", "&Emulation", 0, QApplication::UnicodeUTF8));