summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/common/detached_tasks.h1
-rw-r--r--src/web_service/CMakeLists.txt4
-rw-r--r--src/yuzu/configuration/configure_web.cpp8
-rw-r--r--src/yuzu/main.cpp2
4 files changed, 7 insertions, 8 deletions
diff --git a/src/common/detached_tasks.h b/src/common/detached_tasks.h
index eae27788d..5dd8fc27b 100644
--- a/src/common/detached_tasks.h
+++ b/src/common/detached_tasks.h
@@ -3,6 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#pragma once 5#pragma once
6
6#include <condition_variable> 7#include <condition_variable>
7#include <functional> 8#include <functional>
8 9
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index ef77728c0..1c83e9c34 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -12,5 +12,5 @@ create_target_directory_groups(web_service)
12get_directory_property(OPENSSL_LIBS 12get_directory_property(OPENSSL_LIBS
13 DIRECTORY ${CMAKE_SOURCE_DIR}/externals/libressl 13 DIRECTORY ${CMAKE_SOURCE_DIR}/externals/libressl
14 DEFINITION OPENSSL_LIBS) 14 DEFINITION OPENSSL_LIBS)
15add_definitions(-DCPPHTTPLIB_OPENSSL_SUPPORT) 15target_compile_definitions(web_service PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT)
16target_link_libraries(web_service PUBLIC common json-headers ${OPENSSL_LIBS} httplib lurlparser) 16target_link_libraries(web_service PRIVATE common json-headers ${OPENSSL_LIBS} httplib lurlparser)
diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp
index d6bd3d309..5fb9251db 100644
--- a/src/yuzu/configuration/configure_web.cpp
+++ b/src/yuzu/configuration/configure_web.cpp
@@ -30,11 +30,9 @@ ConfigureWeb::~ConfigureWeb() = default;
30void ConfigureWeb::setConfiguration() { 30void ConfigureWeb::setConfiguration() {
31 ui->web_credentials_disclaimer->setWordWrap(true); 31 ui->web_credentials_disclaimer->setWordWrap(true);
32 ui->telemetry_learn_more->setOpenExternalLinks(true); 32 ui->telemetry_learn_more->setOpenExternalLinks(true);
33 ui->telemetry_learn_more->setText(tr("<a " 33 ui->telemetry_learn_more->setText(
34 "href='https://yuzu-emu.org/entry/" 34 tr("<a href='https://yuzu-emu.org/help/features/telemetry/'><span style=\"text-decoration: "
35 "telemetry-and-why-thats-a-good-thing/'><span " 35 "underline; color:#039be5;\">Learn more</span></a>"));
36 "style=\"text-decoration: underline; "
37 "color:#039be5;\">Learn more</span></a>"));
38 36
39 ui->web_signup_link->setOpenExternalLinks(true); 37 ui->web_signup_link->setOpenExternalLinks(true);
40 ui->web_signup_link->setText( 38 ui->web_signup_link->setText(
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 52743aefd..147e7fcad 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -116,7 +116,7 @@ void GMainWindow::ShowTelemetryCallout() {
116 116
117 UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry); 117 UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
118 const QString telemetry_message = 118 const QString telemetry_message =
119 tr("<a href='https://yuzu-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous " 119 tr("<a href='https://yuzu-emu.org/help/features/telemetry/'>Anonymous "
120 "data is collected</a> to help improve yuzu. " 120 "data is collected</a> to help improve yuzu. "
121 "<br/><br/>Would you like to share your usage data with us?"); 121 "<br/><br/>Would you like to share your usage data with us?");
122 if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) { 122 if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) {