diff options
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 277775ef6..05f6ffe7d 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh | |||
| @@ -5,7 +5,7 @@ cd /yuzu | |||
| 5 | ccache -s | 5 | ccache -s |
| 6 | 6 | ||
| 7 | mkdir build || true && cd build | 7 | mkdir build || true && cd build |
| 8 | cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON | 8 | cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DYUZU_USE_BUNDLED_UNICORN=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON |
| 9 | 9 | ||
| 10 | ninja | 10 | ninja |
| 11 | 11 | ||
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 " |