From 4f9eb9ebcea67bff2a46cfc97ae125472f115a11 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 27 Apr 2022 10:25:53 -0500 Subject: [PATCH] Gui: Compile CONTRIBUTORS into Qt resources --- src/Doc/CMakeLists.txt | 5 ++--- src/Gui/Icons/resource.qrc | 3 +++ src/Gui/Splashscreen.cpp | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Doc/CMakeLists.txt b/src/Doc/CMakeLists.txt index 3649ed4dd09c..5ba9f1b389fb 100644 --- a/src/Doc/CMakeLists.txt +++ b/src/Doc/CMakeLists.txt @@ -3,13 +3,12 @@ configure_file(ThirdPartyLibraries.html ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/ThirdPartyLibraries.html COPYONLY) configure_file(LICENSE.html ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/LICENSE.html COPYONLY) -configure_file(CONTRIBUTORS - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DOCDIR}/CONTRIBUTORS COPYONLY) + +# The CONTRIBUTORS file is now compiled into the FreeCAD GUI Qt resource file INSTALL(FILES ThirdPartyLibraries.html LICENSE.html - CONTRIBUTORS DESTINATION ${CMAKE_INSTALL_DOCDIR} ) diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc index be0dba209fcc..576370934755 100644 --- a/src/Gui/Icons/resource.qrc +++ b/src/Gui/Icons/resource.qrc @@ -259,4 +259,7 @@ Std_ViewScreenShot.svg + + ../../Doc/CONTRIBUTORS + diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index 105c58183864..dc17b3a569d4 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -383,8 +383,7 @@ class AboutDialog::LibraryInfo { void AboutDialog::showCredits() { - QString creditsFileURL = QString::fromLatin1("%1/CONTRIBUTORS") - .arg(QString::fromUtf8(App::Application::getHelpDir().c_str())); + auto creditsFileURL = QLatin1String(":/doc/CONTRIBUTORS"); QFile creditsFile(creditsFileURL); if (!creditsFile.open(QIODevice::ReadOnly | QIODevice::Text)) {