diff options
| author | saturneric <[email protected]> | 2024-11-26 23:01:44 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-11-26 23:01:44 +0000 |
| commit | 7681a521c1c61451291c5086a6dc51e042a96a0f (patch) | |
| tree | 205a6cd4b1351e2ed80e2bc6566b33b77fb84f68 | |
| parent | fix: nightly build only on push (diff) | |
| parent | fix: solve devops build issues (diff) | |
| download | GpgFrontend-7681a521c1c61451291c5086a6dc51e042a96a0f.tar.gz GpgFrontend-7681a521c1c61451291c5086a6dc51e042a96a0f.zip | |
Merge branch 'dev/2.1.5/main' into develop
| m--------- | modules | 0 | ||||
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules b/modules -Subproject 1ce0bca5a88b2a4e7d79892da907410f2ad0775 +Subproject 46d2b31ea023b3b1c886fb7b812c86ec3c4ab0c diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index 33893719..b9c29051 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -343,11 +343,11 @@ auto DecideGpgConfPath(const QString& default_gpgconf_path) -> QString { gpgconf_install_fs_path = SearchGpgconfPath( {"/usr/local/bin/gpgconf", "/opt/homebrew/bin/gpgconf"}); #elif defined(_WIN32) || defined(WIN32) - gnupg_install_fs_path = + gpgconf_install_fs_path = SearchGpgconfPath({"C:/Program Files (x86)/gnupg/bin/gpgconf.exe"}); #else // unix or linux or another platforms - gnupg_install_fs_path = + gpgconf_install_fs_path = SearchGpgconfPath({"/usr/local/bin/gpgconf", "/usr/bin/gpgconf"}); #endif } |