diff options
| author | Saturn&Eric <[email protected]> | 2024-05-11 17:18:36 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-11 17:18:36 +0000 |
| commit | f909f2c4c35b187eb165ec5545e35d54c6d92bf3 (patch) | |
| tree | 428fe9e63ecae6bb93be6f20cd2b1ee9b29ffd8d /src/ui/GpgFrontendApplication.cpp | |
| parent | Merge pull request #145 from jermanuts/jermanuts-wizard-links-update (diff) | |
| parent | fix: remove qt5compat and redirect dll output path of modules (diff) | |
| download | GpgFrontend-f909f2c4c35b187eb165ec5545e35d54c6d92bf3.tar.gz GpgFrontend-f909f2c4c35b187eb165ec5545e35d54c6d92bf3.zip | |
Merge pull request #148 from saturneric/develop
Develop 2.1.3.1
Diffstat (limited to 'src/ui/GpgFrontendApplication.cpp')
| -rw-r--r-- | src/ui/GpgFrontendApplication.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp index 1304aad5..b3c12de6 100644 --- a/src/ui/GpgFrontendApplication.cpp +++ b/src/ui/GpgFrontendApplication.cpp @@ -28,30 +28,28 @@ #include "ui/GpgFrontendApplication.h" -#include <QTextCodec> - -#include "GpgFrontendBuildInfo.h" +#include "core/utils/BuildInfoUtils.h" 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 - GpgFrontendApplication::setApplicationVersion(BUILD_VERSION); - GpgFrontendApplication::setApplicationName(PROJECT_NAME); - GpgFrontendApplication::setApplicationDisplayName(PROJECT_NAME); - GpgFrontendApplication::setOrganizationName(PROJECT_NAME); + GpgFrontendApplication::setApplicationVersion(GetProjectBuildVersion()); + GpgFrontendApplication::setApplicationName(QString::fromUtf8((PROJECT_NAME))); + GpgFrontendApplication::setApplicationDisplayName( + QString::fromUtf8((PROJECT_NAME))); + GpgFrontendApplication::setOrganizationName( + QString::fromUtf8((PROJECT_NAME))); GpgFrontendApplication::setQuitOnLastWindowClosed(true); // don't show icons in menus GpgFrontendApplication::setAttribute(Qt::AA_DontShowIconsInMenus); - - // unicode in source - QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8")); } bool GpgFrontendApplication::notify(QObject *receiver, QEvent *event) { |