From 956b686136232f8cd1b33121602c06c9a12bc874 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Thu, 2 Jan 2014 11:48:22 -0800 Subject: [PATCH] Version information in .exe Still not working fully but more information is getting in there than before. Also by removing VERSION from .pro it fixes problem with vs proj being built incorrectly. --- QGCSetup.pri | 2 +- qgroundcontrol.pro | 7 ------- qgroundcontrol.rc | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index 4d77c67..33f2e77 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -199,4 +199,4 @@ WindowsBuild { QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\"" "$$DESTDIR_WIN\\release\\") } } -} \ No newline at end of file +} diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index 21111aa..b8d6c0d 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -102,18 +102,11 @@ LinuxBuild { WindowsBuild { DEFINES += __STDC_LIMIT_MACROS - VERSION = 2.0.0.227 - QMAKE_TARGET_COMPANY = qgroundcontrol.org - QMAKE_TARGET_PRODUCT = qgroundcontrol - QMAKE_TARGET_DESCRIPTION = "Open source ground control app provided by QGroundControl dev team" - QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2013 QGroundControl Development Team. All rights reserved." - # Specify multi-process compilation within Visual Studio. # (drastically improves compilation times for multi-core computers) QMAKE_CXXFLAGS_DEBUG += -MP QMAKE_CXXFLAGS_RELEASE += -MP - # QWebkit is not needed on MS-Windows compilation environment CONFIG -= webkit diff --git a/qgroundcontrol.rc b/qgroundcontrol.rc index b16014c..31f38f1 100644 --- a/qgroundcontrol.rc +++ b/qgroundcontrol.rc @@ -1 +1,21 @@ IDI_ICON1 ICON DISCARDABLE "files/images/icons/qgroundcontrol.ico" + +1 VERSIONINFO +FILEVERSION 2,0,0,227 +PRODUCTVERSION 2,0,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "qgroundcontrol.org" + VALUE "FileDescription", "Open source ground control app provided by QGroundControl dev team" + VALUE "FileVersion", "2.0.0.227" + VALUE "LegalCopyright", "Copyright (C) 2013 QGroundControl Development Team. All rights reserved." + VALUE "ProductName", "qgroundcontrol" + VALUE "ProductVersion", "2.0" + VALUE "InternalName", "qgroundcontrol" + VALUE "OriginalFilename", "qgroundcontrol.exe" + END + END +END