From e4daf4bee522c046e5e01eeed2c5b12bd91f489e Mon Sep 17 00:00:00 2001
From: fearlessTobi <thm.frey@gmail.com>
Date: Tue, 2 Oct 2018 16:04:10 +0200
Subject: [PATCH] Review comments - part 5
---
src/common/detached_tasks.h | 1 +
src/web_service/CMakeLists.txt | 4 ++--
src/yuzu/configuration/configure_web.cpp | 8 +++-----
src/yuzu/main.cpp | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/common/detached_tasks.h b/src/common/detached_tasks.h
index eae27788d0..5dd8fc27b0 100644
--- a/src/common/detached_tasks.h
+++ b/src/common/detached_tasks.h
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#pragma once
+
#include <condition_variable>
#include <functional>
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index ef77728c01..1c83e9c34b 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -12,5 +12,5 @@ create_target_directory_groups(web_service)
get_directory_property(OPENSSL_LIBS
DIRECTORY ${CMAKE_SOURCE_DIR}/externals/libressl
DEFINITION OPENSSL_LIBS)
-add_definitions(-DCPPHTTPLIB_OPENSSL_SUPPORT)
-target_link_libraries(web_service PUBLIC common json-headers ${OPENSSL_LIBS} httplib lurlparser)
+target_compile_definitions(web_service PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT)
+target_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 d6bd3d309b..5fb9251db4 100644
--- a/src/yuzu/configuration/configure_web.cpp
+++ b/src/yuzu/configuration/configure_web.cpp
@@ -30,11 +30,9 @@ ConfigureWeb::~ConfigureWeb() = default;
void ConfigureWeb::setConfiguration() {
ui->web_credentials_disclaimer->setWordWrap(true);
ui->telemetry_learn_more->setOpenExternalLinks(true);
- ui->telemetry_learn_more->setText(tr("<a "
- "href='https://yuzu-emu.org/entry/"
- "telemetry-and-why-thats-a-good-thing/'><span "
- "style=\"text-decoration: underline; "
- "color:#039be5;\">Learn more</span></a>"));
+ ui->telemetry_learn_more->setText(
+ tr("<a href='https://yuzu-emu.org/help/features/telemetry/'><span style=\"text-decoration: "
+ "underline; color:#039be5;\">Learn more</span></a>"));
ui->web_signup_link->setOpenExternalLinks(true);
ui->web_signup_link->setText(
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 52743aefd3..147e7fcad9 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -116,7 +116,7 @@ void GMainWindow::ShowTelemetryCallout() {
UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
const QString telemetry_message =
- tr("<a href='https://yuzu-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous "
+ tr("<a href='https://yuzu-emu.org/help/features/telemetry/'>Anonymous "
"data is collected</a> to help improve yuzu. "
"<br/><br/>Would you like to share your usage data with us?");
if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) {