diff options
| author | 2016-04-29 02:17:31 +0200 | |
|---|---|---|
| committer | 2016-04-28 20:17:31 -0400 | |
| commit | 90501f20e6b91fcd2beaccf0b1a0174b189da09c (patch) | |
| tree | 9f909f9402d09e9a6175d37383aece363baba2f9 /src/citra_qt/main.cpp | |
| parent | Merge pull request #1727 from MerryMage/minor-commit (diff) | |
| download | yuzu-90501f20e6b91fcd2beaccf0b1a0174b189da09c.tar.gz yuzu-90501f20e6b91fcd2beaccf0b1a0174b189da09c.tar.xz yuzu-90501f20e6b91fcd2beaccf0b1a0174b189da09c.zip | |
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709)
* Make Citra build with MICROPROFILE_ENABLED set to 0
* Buildfix with microprofile kept on
* moc did not like a dialog to conditionally exist.
* Cleanup
* Fix end of line
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 2ca1e51f6..f1ab29755 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -69,8 +69,10 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) | |||
| 69 | addDockWidget(Qt::BottomDockWidgetArea, profilerWidget); | 69 | addDockWidget(Qt::BottomDockWidgetArea, profilerWidget); |
| 70 | profilerWidget->hide(); | 70 | profilerWidget->hide(); |
| 71 | 71 | ||
| 72 | #if MICROPROFILE_ENABLED | ||
| 72 | microProfileDialog = new MicroProfileDialog(this); | 73 | microProfileDialog = new MicroProfileDialog(this); |
| 73 | microProfileDialog->hide(); | 74 | microProfileDialog->hide(); |
| 75 | #endif | ||
| 74 | 76 | ||
| 75 | disasmWidget = new DisassemblerWidget(this, emu_thread.get()); | 77 | disasmWidget = new DisassemblerWidget(this, emu_thread.get()); |
| 76 | addDockWidget(Qt::BottomDockWidgetArea, disasmWidget); | 78 | addDockWidget(Qt::BottomDockWidgetArea, disasmWidget); |
| @@ -110,7 +112,9 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) | |||
| 110 | 112 | ||
| 111 | QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging")); | 113 | QMenu* debug_menu = ui.menu_View->addMenu(tr("Debugging")); |
| 112 | debug_menu->addAction(profilerWidget->toggleViewAction()); | 114 | debug_menu->addAction(profilerWidget->toggleViewAction()); |
| 115 | #if MICROPROFILE_ENABLED | ||
| 113 | debug_menu->addAction(microProfileDialog->toggleViewAction()); | 116 | debug_menu->addAction(microProfileDialog->toggleViewAction()); |
| 117 | #endif | ||
| 114 | debug_menu->addAction(disasmWidget->toggleViewAction()); | 118 | debug_menu->addAction(disasmWidget->toggleViewAction()); |
| 115 | debug_menu->addAction(registersWidget->toggleViewAction()); | 119 | debug_menu->addAction(registersWidget->toggleViewAction()); |
| 116 | debug_menu->addAction(callstackWidget->toggleViewAction()); | 120 | debug_menu->addAction(callstackWidget->toggleViewAction()); |
| @@ -136,8 +140,10 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) | |||
| 136 | restoreGeometry(UISettings::values.geometry); | 140 | restoreGeometry(UISettings::values.geometry); |
| 137 | restoreState(UISettings::values.state); | 141 | restoreState(UISettings::values.state); |
| 138 | render_window->restoreGeometry(UISettings::values.renderwindow_geometry); | 142 | render_window->restoreGeometry(UISettings::values.renderwindow_geometry); |
| 143 | #if MICROPROFILE_ENABLED | ||
| 139 | microProfileDialog->restoreGeometry(UISettings::values.microprofile_geometry); | 144 | microProfileDialog->restoreGeometry(UISettings::values.microprofile_geometry); |
| 140 | microProfileDialog->setVisible(UISettings::values.microprofile_visible); | 145 | microProfileDialog->setVisible(UISettings::values.microprofile_visible); |
| 146 | #endif | ||
| 141 | 147 | ||
| 142 | game_list->LoadInterfaceLayout(); | 148 | game_list->LoadInterfaceLayout(); |
| 143 | 149 | ||
| @@ -511,9 +517,10 @@ void GMainWindow::closeEvent(QCloseEvent* event) { | |||
| 511 | UISettings::values.geometry = saveGeometry(); | 517 | UISettings::values.geometry = saveGeometry(); |
| 512 | UISettings::values.state = saveState(); | 518 | UISettings::values.state = saveState(); |
| 513 | UISettings::values.renderwindow_geometry = render_window->saveGeometry(); | 519 | UISettings::values.renderwindow_geometry = render_window->saveGeometry(); |
| 520 | #if MICROPROFILE_ENABLED | ||
| 514 | UISettings::values.microprofile_geometry = microProfileDialog->saveGeometry(); | 521 | UISettings::values.microprofile_geometry = microProfileDialog->saveGeometry(); |
| 515 | UISettings::values.microprofile_visible = microProfileDialog->isVisible(); | 522 | UISettings::values.microprofile_visible = microProfileDialog->isVisible(); |
| 516 | 523 | #endif | |
| 517 | UISettings::values.single_window_mode = ui.action_Single_Window_Mode->isChecked(); | 524 | UISettings::values.single_window_mode = ui.action_Single_Window_Mode->isChecked(); |
| 518 | UISettings::values.display_titlebar = ui.actionDisplay_widget_title_bars->isChecked(); | 525 | UISettings::values.display_titlebar = ui.actionDisplay_widget_title_bars->isChecked(); |
| 519 | UISettings::values.first_start = false; | 526 | UISettings::values.first_start = false; |