diff options
| author | 2020-11-30 13:57:47 -0500 | |
|---|---|---|
| committer | 2020-11-30 13:57:47 -0500 | |
| commit | 44f7067cab5c8999a69f8dd92574a2b6e8edfe34 (patch) | |
| tree | c5a51af75f5ee0b4edfb3debc119cd2c34b16c2c /src | |
| parent | Merge pull request #4939 from german77/MouseInput (diff) | |
| parent | Disable web applet and warning when compiling for Linux on CI (diff) | |
| download | yuzu-44f7067cab5c8999a69f8dd92574a2b6e8edfe34.tar.gz yuzu-44f7067cab5c8999a69f8dd92574a2b6e8edfe34.tar.xz yuzu-44f7067cab5c8999a69f8dd92574a2b6e8edfe34.zip | |
Merge pull request #5045 from lat9nq/disable-applet
Disable web applet and warning box when compiling for Linux on CI
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 871ff4ae4..26f5e42ed 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -477,11 +477,13 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view | |||
| 477 | #else | 477 | #else |
| 478 | 478 | ||
| 479 | void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view additional_args) { | 479 | void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view additional_args) { |
| 480 | #ifndef __linux__ | ||
| 480 | QMessageBox::warning( | 481 | QMessageBox::warning( |
| 481 | this, tr("Web Applet"), | 482 | this, tr("Web Applet"), |
| 482 | tr("This version of yuzu was built without QtWebEngine support, meaning that yuzu cannot " | 483 | tr("This version of yuzu was built without QtWebEngine support, meaning that yuzu cannot " |
| 483 | "properly display the game manual or web page requested."), | 484 | "properly display the game manual or web page requested."), |
| 484 | QMessageBox::Ok, QMessageBox::Ok); | 485 | QMessageBox::Ok, QMessageBox::Ok); |
| 486 | #endif | ||
| 485 | 487 | ||
| 486 | LOG_INFO(Frontend, | 488 | LOG_INFO(Frontend, |
| 487 | "(STUBBED) called - Missing QtWebEngine dependency needed to open website page at " | 489 | "(STUBBED) called - Missing QtWebEngine dependency needed to open website page at " |