From 0a6ac4d9932fc57d9956fc3a6d39f6d57ca6ef68 Mon Sep 17 00:00:00 2001
From: OatmealDome
Date: Tue, 17 Aug 2021 22:34:53 -0400
Subject: [PATCH 1/3] AboutDialog: Fix broken license link
---
Source/Core/DolphinQt/AboutDialog.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp
index 0f7748005e..047682d31d 100644
--- a/Source/Core/DolphinQt/AboutDialog.cpp
+++ b/Source/Core/DolphinQt/AboutDialog.cpp
@@ -41,7 +41,7 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
-%LICENSE% |
+%LICENSE% |
%AUTHORS% |
%SUPPORT%
)")
From 6aa2a6b4661f4a193d277485ec2f10ac6829878b Mon Sep 17 00:00:00 2001
From: OatmealDome
Date: Tue, 17 Aug 2021 22:35:42 -0400
Subject: [PATCH 2/3] UISettings: Remove missed comment about license.txt
---
Source/Core/Core/Config/UISettings.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/Source/Core/Core/Config/UISettings.cpp b/Source/Core/Core/Config/UISettings.cpp
index 6210e54bff..881868433c 100644
--- a/Source/Core/Core/Config/UISettings.cpp
+++ b/Source/Core/Core/Config/UISettings.cpp
@@ -1,6 +1,5 @@
// Copyright 2018 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-// Refer to the license.txt file included
#include "Core/Config/UISettings.h"
From 5c5c3b885608fa3d31467bdb59b7ebb9ecf0bfa2 Mon Sep 17 00:00:00 2001
From: OatmealDome
Date: Tue, 17 Aug 2021 22:40:27 -0400
Subject: [PATCH 3/3] DolphinQt: Copy COPYING and Licenses directory to output
---
Source/Core/DolphinQt/CMakeLists.txt | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
index 2c6ad5c0ef..474f30a631 100644
--- a/Source/Core/DolphinQt/CMakeLists.txt
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -375,9 +375,14 @@ if(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/Data/Sys" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Sys"
)
- # Copy license.txt
+ # Copy COPYING
add_custom_command(TARGET dolphin-emu POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/license.txt"
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/COPYING"
+ )
+
+ # Copy Licenses dir
+ add_custom_command(TARGET dolphin-emu POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/LICENSES" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Licenses"
)
# Copy qt.conf