diff --git a/src/app/puzzle/share/resources/puzzle.rc b/src/app/puzzle/share/resources/puzzle.rc index f6f8234b4..cb9a658b4 100644 --- a/src/app/puzzle/share/resources/puzzle.rc +++ b/src/app/puzzle/share/resources/puzzle.rc @@ -62,14 +62,14 @@ BEGIN BLOCK "040904E4" BEGIN VALUE "CompanyName", VER_COMPANYNAME_STR - VALUE "FileDescription", "Valentina's manual layout creator." + VALUE "FileDescription", VER_FILEDESCRIPTION_STR VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "Puzzle" + VALUE "InternalName", VER_INTERNALNAME_STR VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR - VALUE "OriginalFilename", "puzzle.exe" - VALUE "ProductName", "Puzzle" + VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR + VALUE "ProductName", VER_PRODUCTNAME_STR VALUE "ProductVersion", VER_PRODUCTVERSION_STR END END diff --git a/src/app/puzzle/version.h b/src/app/puzzle/version.h index 300d63027..00921de57 100644 --- a/src/app/puzzle/version.h +++ b/src/app/puzzle/version.h @@ -29,12 +29,11 @@ #ifndef VERSION_H #define VERSION_H -#include #include "../../libs/vmisc/projectversion.h" -extern const QString verInternalNameStr; -extern const QString verOriginalFilenameStr; -extern const QString verProductNameStr; -extern const QString verFileDescriptionStr; +#define VER_INTERNALNAME_STR "Puzzle" +#define VER_ORIGINALFILENAME_STR "puzzle.exe" +#define VER_PRODUCTNAME_STR "Puzzle" +#define VER_FILEDESCRIPTION_STR "Valentina's manual layout creator." #endif // VERSION_H diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp index 3c5d1c0f5..e2f5b36e3 100644 --- a/src/app/puzzle/vpapplication.cpp +++ b/src/app/puzzle/vpapplication.cpp @@ -71,15 +71,10 @@ Q_LOGGING_CATEGORY(pApp, "p.application") // NOLINT QT_WARNING_POP -const QString verInternalNameStr = QStringLiteral("Puzzle"); -const QString verOriginalFilenameStr = QStringLiteral("puzzle.exe"); -const QString verProductNameStr = QStringLiteral("Puzzle"); -const QString verFileDescriptionStr = QStringLiteral("Valentina's manual layout creator."); - -//#define VER_INTERNALNAME_STR "Puzzle" -//#define VER_ORIGINALFILENAME_STR "puzzle.exe" -//#define VER_PRODUCTNAME_STR "Puzzle" -//#define VER_FILEDESCRIPTION_STR "Valentina's manual layout creator." +#define VER_INTERNALNAME_STR "Puzzle" +#define VER_ORIGINALFILENAME_STR "puzzle.exe" +#define VER_PRODUCTNAME_STR "Puzzle" +#define VER_FILEDESCRIPTION_STR "Valentina's manual layout creator." //--------------------------------------------------------------------------------------------------------------------- inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &context, @@ -259,8 +254,8 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con VPApplication::VPApplication(int &argc, char **argv) : VAbstractApplication(argc, argv) { - setApplicationDisplayName(verProductNameStr); - setApplicationName(verInternalNameStr); + setApplicationDisplayName(QStringLiteral(VER_PRODUCTNAME_STR)); + setApplicationName(QStringLiteral(VER_INTERNALNAME_STR)); setOrganizationName(QStringLiteral(VER_COMPANYNAME_STR)); setOrganizationDomain(QStringLiteral(VER_COMPANYDOMAIN_STR)); // Setting the Application version