diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-16 10:51:26 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-23 15:43:37 +0000 |
commit | fe23614c7a502b7d89845b554c82bf4acd805ed9 (patch) | |
tree | 4aa946d6ead0b4e39ccc2eccfb4e7dcf61fbcf89 | |
parent | 50200d1614f67eacf5606ac7275faa40b20ec312 (diff) | |
download | qttools-fe23614c7a502b7d89845b554c82bf4acd805ed9.tar.gz |
Windows: Fix copyright and product version of Assistant/Designer/Linguist
Remove the .rc files and set the relevant qmake variables.
Change-Id: I3b5972ec8a04000c7fbf311421379d81bce965b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r-- | src/assistant/assistant/assistant.pro | 8 | ||||
-rw-r--r-- | src/assistant/assistant/assistant.rc | 32 | ||||
-rw-r--r-- | src/designer/src/designer/designer.pro | 8 | ||||
-rw-r--r-- | src/designer/src/designer/designer.rc | 32 | ||||
-rw-r--r-- | src/linguist/linguist/linguist.pro | 11 | ||||
-rw-r--r-- | src/linguist/linguist/linguist.rc | 32 |
6 files changed, 24 insertions, 99 deletions
diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index c8fb21f1c..ef71536d4 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -102,9 +102,15 @@ FORMS += bookmarkdialog.ui \ RESOURCES += assistant.qrc \ assistant_images.qrc +QMAKE_TARGET_PRODUCT = Qt Assistant +QMAKE_TARGET_DESCRIPTION = Tool for viewing on-line documentation in Qt help file format + win32 { LIBS += -lshell32 - RC_FILE = assistant.rc + RC_ICONS = assistant.ico + VERSION = $${QT_VERSION}.0 +} else { + VERSION = $${QT_VERSION} } mac { diff --git a/src/assistant/assistant/assistant.rc b/src/assistant/assistant/assistant.rc deleted file mode 100644 index 99434dc16..000000000 --- a/src/assistant/assistant/assistant.rc +++ /dev/null @@ -1,32 +0,0 @@ -#include "winver.h" - -IDI_ICON1 ICON DISCARDABLE "assistant.ico" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,0 - PRODUCTVERSION 1,0,0,0 - FILEFLAGS 0x0L - FILEFLAGSMASK 0x3fL - FILEOS 0x00040004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)" - VALUE "FileDescription", "Qt Assistant" - VALUE "FileVersion", "1.0.0.0" - VALUE "LegalCopyright", "Copyright (C) 2015 The Qt Company Ltd." - VALUE "InternalName", "assistant.exe" - VALUE "OriginalFilename", "assistant.exe" - VALUE "ProductName", "Qt Assistant" - VALUE "ProductVersion", "1.0.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index bcefebb03..0201ea6c2 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -59,8 +59,14 @@ FORMS += saveformastemplate.ui \ preferencesdialog.ui \ qdesigner_appearanceoptions.ui +QMAKE_TARGET_PRODUCT = Qt Designer +QMAKE_TARGET_DESCRIPTION = Tool for designing and building graphical user interfaces with Qt Widgets + win32 { - RC_FILE = designer.rc + RC_ICONS = designer.ico + VERSION = $${QT_VERSION}.0 +} else { + VERSION = $${QT_VERSION} } mac { diff --git a/src/designer/src/designer/designer.rc b/src/designer/src/designer/designer.rc deleted file mode 100644 index f2af6136d..000000000 --- a/src/designer/src/designer/designer.rc +++ /dev/null @@ -1,32 +0,0 @@ -#include "winver.h" - -IDI_ICON1 ICON DISCARDABLE "designer.ico" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,0 - PRODUCTVERSION 1,0,0,0 - FILEFLAGS 0x0L - FILEFLAGSMASK 0x3fL - FILEOS 0x00040004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)" - VALUE "FileDescription", "Qt Designer" - VALUE "FileVersion", "1.0.0.0" - VALUE "LegalCopyright", "Copyright (C) 2015 The Qt Company Ltd." - VALUE "InternalName", "designer" - VALUE "OriginalFilename", "designer.exe" - VALUE "ProductName", "Qt Designer" - VALUE "ProductVersion", "1.0.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index 742a04144..c3de1c6a8 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -58,7 +58,16 @@ HEADERS += \ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES += QT_KEYWORDS TARGET = linguist -win32:RC_FILE = linguist.rc + +QMAKE_TARGET_PRODUCT = Qt Linguist +QMAKE_TARGET_DESCRIPTION = Tool for adding translations to Qt applications + +win32 { + RC_ICONS = linguist.ico + VERSION = $${QT_VERSION}.0 +} else { + VERSION = $${QT_VERSION} +} mac { static:CONFIG -= global_init_link_order ICON = linguist.icns diff --git a/src/linguist/linguist/linguist.rc b/src/linguist/linguist/linguist.rc deleted file mode 100644 index b4b06c9e0..000000000 --- a/src/linguist/linguist/linguist.rc +++ /dev/null @@ -1,32 +0,0 @@ -#include "winver.h" - -IDI_ICON1 ICON DISCARDABLE "linguist.ico" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,0 - PRODUCTVERSION 1,0,0,0 - FILEFLAGS 0x0L - FILEFLAGSMASK 0x3fL - FILEOS 0x00040004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "CompanyName", "Digia Plc and/or its subsidiary(-ies)" - VALUE "FileDescription", "Qt Linguist" - VALUE "FileVersion", "1.0.0.0" - VALUE "LegalCopyright", "Copyright (C) 2015 The Qt Company Ltd." - VALUE "InternalName", "linguist" - VALUE "OriginalFilename", "linguist.exe" - VALUE "ProductName", "Qt Linguist" - VALUE "ProductVersion", "1.0.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END |