Little change in Windows .manifest file.

--HG--
branch : develop
This commit is contained in:
dismine 2014-07-21 14:47:48 +03:00
parent 717a94879c
commit 84beb053c3
5 changed files with 31 additions and 12 deletions

View File

@ -72,7 +72,7 @@ RESOURCES += \
OTHER_FILES += \ OTHER_FILES += \
share/resources/valentina.rc \ share/resources/valentina.rc \
share/resources/valentina.manifest \ share/resources/valentina.exe.manifest \
share/resources/icon/64x64/icon64x64.ico share/resources/icon/64x64/icon64x64.ico
TRANSLATIONS += share/translations/valentina.ts \ TRANSLATIONS += share/translations/valentina.ts \

View File

@ -0,0 +1,20 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<assemblyIdentity
version="0.2.2.0"
processorArchitecture="*"
name="ValentinaTeam.Valentina.Valentina"
type="win32"
/>
<dependency>
<dependentAssembly>
<assemblyIdentity
type='win32'
name='Microsoft.Windows.Common-Controls'
version='6.0.0.0'
publicKeyToken='6595b64144ccf1df'
language='*'
processorArchitecture='*' />
</dependentAssembly>
</dependency>
</assembly>

View File

@ -1,8 +0,0 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*' />
</dependentAssembly>
</dependency>
</assembly>

View File

@ -5,7 +5,9 @@ IDI_ICON1 ICON DISCARDABLE "icon/64x64/icon64x64.ico"
// contains a reference to a magic manifest file which specifies that your // contains a reference to a magic manifest file which specifies that your
// app using v6 of the MS common controls library. // app using v6 of the MS common controls library.
// http://qtcreator.blogspot.it/2009/10/xp-style-common-dialogs.html // http://qtcreator.blogspot.it/2009/10/xp-style-common-dialogs.html
1 24 DISCARDABLE "valentina.manifest" 1 24 DISCARDABLE "valentina.exe.manifest"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "valentina.exe.manifest"
#include <windows.h> #include <windows.h>
#include "../../version.h" #include "../../version.h"
@ -13,6 +15,9 @@ IDI_ICON1 ICON DISCARDABLE "icon/64x64/icon64x64.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION FILEVERSION VER_FILEVERSION
PRODUCTVERSION VER_PRODUCTVERSION PRODUCTVERSION VER_PRODUCTVERSION
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
FILESUBTYPE VFT2_UNKNOWN
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
@ -33,6 +38,6 @@ BEGIN
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1252 VALUE "Translation", 0x409, 1200, 0x0405, 1200, 0x0407, 1200, 0x040C, 1200, 0x040D, 1200, 0x0413, 1200, 0x0419, 1200
END END
END END

View File

@ -38,6 +38,8 @@ extern const int DEBUG_VERSION;
extern const QString APP_VERSION; extern const QString APP_VERSION;
extern const QString WARRANTY; extern const QString WARRANTY;
// Don't forget change version number in manifest file.
#define VER_FILEVERSION 0,2,2,0 #define VER_FILEVERSION 0,2,2,0
#define VER_FILEVERSION_STR "0.2.2.0\0" #define VER_FILEVERSION_STR "0.2.2.0\0"
@ -45,7 +47,7 @@ extern const QString WARRANTY;
#define VER_PRODUCTVERSION_STR "0.2\0" #define VER_PRODUCTVERSION_STR "0.2\0"
#define VER_COMPANYNAME_STR "ValentinaTeam" #define VER_COMPANYNAME_STR "ValentinaTeam"
#define VER_FILEDESCRIPTION_STR "Valentina" #define VER_FILEDESCRIPTION_STR "Patternmaking program."
#define VER_INTERNALNAME_STR "Valentina" #define VER_INTERNALNAME_STR "Valentina"
#define VER_LEGALCOPYRIGHT_STR "Copyright © 2014 Valentina Team" #define VER_LEGALCOPYRIGHT_STR "Copyright © 2014 Valentina Team"
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved" #define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"