diff options
| author | saturneric <[email protected]> | 2024-11-27 07:31:34 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-11-27 07:31:34 +0000 |
| commit | 7bdb27b2c28d5f00f643042dbb37dd2c05ba9163 (patch) | |
| tree | ec0aff55f9c59ed726b158e905d391daeea61a46 | |
| parent | Merge branch 'dev/2.1.5/main' into develop (diff) | |
| download | GpgFrontend-7bdb27b2c28d5f00f643042dbb37dd2c05ba9163.tar.gz GpgFrontend-7bdb27b2c28d5f00f643042dbb37dd2c05ba9163.zip | |
fix: solve nightly build issues
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 2 | ||||
| -rw-r--r-- | src/core/utils/BuildInfoUtils.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index b9c29051..e761b857 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -317,7 +317,7 @@ auto DecideGpgConfPath(const QString& default_gpgconf_path) -> QString { // check gpgconf path gpgconf_install_fs_path = custom_gnupg_install_path; #if defined(_WIN32) || defined(WIN32) - gnupg_install_fs_path += "/gpgconf.exe"; + gpgconf_install_fs_path += "/gpgconf.exe"; #else gpgconf_install_fs_path += "/gpgconf"; #endif diff --git a/src/core/utils/BuildInfoUtils.cpp b/src/core/utils/BuildInfoUtils.cpp index ed72cebe..cb738c3c 100644 --- a/src/core/utils/BuildInfoUtils.cpp +++ b/src/core/utils/BuildInfoUtils.cpp @@ -57,9 +57,7 @@ auto GetProjectBuildGitVersion() -> QString { return GIT_VERSION; } auto GetProjectQtVersion() -> QString { return {qVersion()}; } -auto GetProjectOpenSSLVersion() -> QString { - return {OPENSSL_FULL_VERSION_STR}; -} +auto GetProjectOpenSSLVersion() -> QString { return {OPENSSL_VERSION_TEXT}; } auto GetProjectLibarchiveVersion() -> QString { return {ARCHIVE_VERSION_ONLY_STRING}; |