diff options
author | saturneric <[email protected]> | 2024-03-02 18:22:27 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2024-03-02 18:22:27 +0000 |
commit | 3a0b2bd05af92fff313dcc6fa34fb87ac8030746 (patch) | |
tree | 420cc23dc12ca947e39906981c8814e04b51e0c4 /src/ui/GpgFrontendApplication.cpp | |
parent | fix: change GpgFrontend to Gpg Frontend on linux platform (diff) | |
parent | feat: add user agent header when doing http request (diff) | |
download | GpgFrontend-3a0b2bd05af92fff313dcc6fa34fb87ac8030746.tar.gz GpgFrontend-3a0b2bd05af92fff313dcc6fa34fb87ac8030746.zip |
Merge branch 'dev/2.1.2/main' into develop
Diffstat (limited to 'src/ui/GpgFrontendApplication.cpp')
-rw-r--r-- | src/ui/GpgFrontendApplication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp index 1304aad5..c832ffe0 100644 --- a/src/ui/GpgFrontendApplication.cpp +++ b/src/ui/GpgFrontendApplication.cpp @@ -36,8 +36,9 @@ namespace GpgFrontend::UI { GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[]) : QApplication(argc, argv) { -#ifndef MACOS - this->setWindowIcon(QIcon(":/icons/gpgfrontend.png")); +#if defined(DEBUG) || !defined(MACOS) + GpgFrontend::UI::GpgFrontendApplication::setWindowIcon( + QIcon(":/icons/gpgfrontend.png")); #endif // set the extra information of the build |